diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-01-25 21:13:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-25 21:13:36 +0000 |
| commit | 32af4e15048e53b223294ad33ac428f992bfd0eb (patch) | |
| tree | 7aea0417345a9972a1c27ac3cb7d7a116b1a211b | |
| parent | b3904a718bbf278034afb231df3473e7138b05ac (diff) | |
android: missing header pieces
| -rw-r--r-- | vcl/inc/android/androidinst.hxx | 13 | ||||
| -rw-r--r-- | vcl/inc/headless/svpframe.hxx | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx index 3b026b0d9357..aec273553df9 100644 --- a/vcl/inc/android/androidinst.hxx +++ b/vcl/inc/android/androidinst.hxx @@ -30,22 +30,33 @@ #ifndef ANDROID_SALINST_H #define ANDROID_SALINST_H +#include <android/input.h> +#include <android/native_window.h> #include <headless/svpinst.hxx> +#include <headless/svpframe.hxx> class AndroidSalInstance : public SvpSalInstance { + void RedrawWindows(ANativeWindow *pWindow); + void BlitFrameToWindow(ANativeWindow *pWindow, + const basebmp::BitmapDeviceSharedPtr& aDev); public: AndroidSalInstance( SalYieldMutex *pMutex ); virtual ~AndroidSalInstance(); + static AndroidSalInstance *getInstance(); virtual SalSystem* CreateSalSystem(); // mainloop pieces virtual void Wakeup(); virtual bool AnyInput( sal_uInt16 nType ); + + // incoming android event handlers: + void onAppCmd (struct android_app* app, int32_t cmd); + int32_t onInputEvent (struct android_app* app, AInputEvent* event); protected: virtual void DoReleaseYield( int nTimeoutMS ); - struct android_app *app; + struct android_app *mpApp; }; #endif // ANDROID_SALINST_H diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 5f88e64df3e1..37e0ae98b95d 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -41,9 +41,9 @@ class SvpSalGraphics; class SvpSalFrame : public SalFrame, public SvpElement { SvpSalInstance* m_pInstance; - SvpSalFrame* m_pParent; // pointer to parent frame + SvpSalFrame* m_pParent; // pointer to parent frame std::list< SvpSalFrame* > m_aChildren; // List of child frames - sal_uLong m_nStyle; + sal_uLong m_nStyle; bool m_bVisible; long m_nMinWidth; long m_nMinHeight; |