diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-02-03 18:49:59 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-03 18:51:24 +0100 |
| commit | 29aa585b2ee2af0680eb39749d1797f52e190a3a (patch) | |
| tree | b10354db46f7582157d254568a6caed64e9400b3 /vcl | |
| parent | 1b48979a27f280a87087ee99e012285050522b95 (diff) | |
android: get the focus window from SvpSalFrame
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/android/androidinst.cxx | 7 | ||||
| -rw-r--r-- | vcl/inc/generic/geninst.h | 6 | ||||
| -rw-r--r-- | vcl/inc/headless/svpframe.hxx | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 6d70471e035f..50a3040da0c6 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -321,11 +321,6 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow) mbQueueReDraw = false; } -SalFrame *AndroidSalInstance::getFocusFrame() const -{ - return !getFrames().empty() ? *getFrames().begin() : NULL; -} - static const char *app_cmd_name(int cmd) { switch (cmd) { @@ -436,7 +431,7 @@ int32_t AndroidSalInstance::onInputEvent (struct android_app* app, AInputEvent* aEvent.mnCharCode = 'a'; // the unicode of it all ... aEvent.mnRepeat = AKeyEvent_getRepeatCount(event); - SalFrame *pFocus = getFocusFrame(); + SalFrame *pFocus = SvpSalFrame::GetFocusFrame(); if (pFocus) bHandled = pFocus->CallCallback( nEvent, &aEvent ); else diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index 471b6307c38f..240ebe676e0b 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -103,7 +103,7 @@ public: virtual void GetPrinterQueueInfo ( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState ( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual rtl::OUString GetDefaultPrinter(); virtual void PostPrintersChanged() = 0; virtual void updatePrinterUpdate(); virtual void jobStartedPrinterUpdate(); @@ -117,8 +117,8 @@ public: protected: void configurePspInfoPrinter( PspSalInfoPrinter* pInfoPrinter, - SalPrinterQueueInfo* pQueueInfo, - ImplJobSetup* pSetupData ); + SalPrinterQueueInfo* pQueueInfo, + ImplJobSetup* pSetupData ); }; inline SalGenericInstance *GetGenericInstance() diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index fc923af5a203..8c30e23d439f 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -127,6 +127,9 @@ public: virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; } virtual void SetApplicationID(const rtl::OUString &rApplicationID) { (void) rApplicationID; } bool IsVisible() { return m_bVisible; } + + static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } + }; #endif // _SVP_SVPFRAME_HXX |