diff options
| author | Lucas Baudin <xapantu@gmail.com> | 2011-09-29 19:47:01 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:49 +0100 |
| commit | ef93683de1b1d1dbcd7e76df5033c4d117198667 (patch) | |
| tree | 2fef99268387dc501e1988c94032b548d595c763 /vcl/inc | |
| parent | 6da6ddcf0393f92eadf4d2db331b1514c823ec7e (diff) | |
Gtk3 fixes, I tweaked the damage function to debug the rendering (the damage are is bigger to see a whole widget), if will need to be removed once we will fix that
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkgdi.hxx | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 2be332448c4d..0e3ada125613 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -181,9 +181,6 @@ class GtkSalFrame : public SalFrame, basebmp::BitmapDeviceDamageTracker int m_nScreen; GtkWidget* m_pWindow; guint m_nIdleFullScreen; -#if GTK_CHECK_VERSION(3,0,0) - basebmp::BitmapDeviceSharedPtr m_aFrame; -#endif int m_nDuringRender; GdkWindow* m_pForeignParent; GdkNativeWindow m_aForeignParentWindow; @@ -303,6 +300,9 @@ class GtkSalFrame : public SalFrame, basebmp::BitmapDeviceDamageTracker DECL_LINK( ImplDelayedFullScreenHdl, void* ); public: +#if GTK_CHECK_VERSION(3,0,0) + basebmp::BitmapDeviceSharedPtr m_aFrame; +#endif GtkSalFrame( SalFrame* pParent, sal_uLong nStyle ); GtkSalFrame( SystemParentData* pSysData ); diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 1fd2e5e80632..589a1094ab50 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -51,7 +51,6 @@ public: long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ); - void updateSettings( AllSettings& rSettings ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, @@ -64,9 +63,18 @@ public: const rtl::OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); + void updateSettings( AllSettings& rSettings ); private: GtkWidget *mpWindow; GtkStyleContext *mpButtonStyle; + GtkStyleContext *mpEntryStyle; + GtkStyleContext *mpScrollbarStyle; + GtkStyleContext *mpToolbarStyle; + GtkStyleContext *mpToolButtonStyle; + void renderAreaToPix( cairo_t* cr, cairo_rectangle_t* rect ); + void drawStyleContext( GtkStyleContext* style, GtkStateFlags flags, + const Rectangle& rControlRegion, bool render_background = true ); + void getStyleContext( GtkStyleContext** style, GtkWidget* widget ); }; #else |