Kaydet (Commit) cfaa2b55 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

implement X11WindowProvider for GtkSalFrame

Change-Id: Id763f9b69f4d4476a3b6401bb83e2bf173248e8a
üst 2d472d94
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <salframe.hxx> #include <salframe.hxx>
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
#include <unx/x11windowprovider.hxx>
#include <unx/saltype.h> #include <unx/saltype.h>
#include "tools/link.hxx" #include "tools/link.hxx"
...@@ -58,7 +59,7 @@ typedef ::Window GdkNativeWindow; ...@@ -58,7 +59,7 @@ typedef ::Window GdkNativeWindow;
typedef void GDBusConnection; typedef void GDBusConnection;
#endif #endif
class GtkSalFrame : public SalFrame class GtkSalFrame : public SalFrame, public X11WindowProvider
{ {
static const int nMaxGraphics = 2; static const int nMaxGraphics = 2;
...@@ -445,6 +446,8 @@ public: ...@@ -445,6 +446,8 @@ public:
static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); static GtkSalFrame *getFromWindow( GtkWindow *pWindow );
virtual void damaged (const basegfx::B2IBox& rDamageRect); virtual void damaged (const basegfx::B2IBox& rDamageRect);
virtual Window GetX11Window() SAL_OVERRIDE;
}; };
#define OOO_TYPE_FIXED ooo_fixed_get_type() #define OOO_TYPE_FIXED ooo_fixed_get_type()
......
...@@ -4508,4 +4508,9 @@ Size GtkSalDisplay::GetScreenSize( int nDisplayScreen ) ...@@ -4508,4 +4508,9 @@ Size GtkSalDisplay::GetScreenSize( int nDisplayScreen )
return Size( aRect.GetWidth(), aRect.GetHeight() ); return Size( aRect.GetWidth(), aRect.GetHeight() );
} }
Window GtkSalFrame::GetX11Window()
{
return widget_get_xid(m_pWindow);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment