[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Tor Lillqvist]

 vcl/inc/unx/gtk/gtkframe.hxx       |    4 ++--
 vcl/unx/gtk/window/gtksalframe.cxx |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 83076579132eabf50748c15d7a8defb6c3aa851e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 5 11:34:52 2015 +0300

    AllocateFrame() and TriggerPaintEvent() can't be static when --enable-gtk3
    
    Change-Id: I1d637285b6b6ef64b83ab759bd4a379713bbf96b

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 6c354c3..de8903e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -304,8 +304,8 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
     void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen );
     void askForXEmbedFocus( sal_Int32 nTimecode );
 
-    static void AllocateFrame();
-    static void TriggerPaintEvent();
+    void AllocateFrame();
+    void TriggerPaintEvent();
 
     void updateWMClass();
     void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = NULL );
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 2c829db..26825f2 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3653,7 +3653,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
 #endif
 
     pThis->CallCallback( SALEVENT_RESIZE, NULL );
-    TriggerPaintEvent();
+    pThis->TriggerPaintEvent();
 
     return false;
 }
@@ -3739,7 +3739,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
 
     pThis->updateScreenNumber();
     if( bSized )
-        AllocateFrame();
+        pThis->AllocateFrame();
 
     if( bMoved && bSized )
         pThis->CallCallback( SALEVENT_MOVERESIZE, NULL );
@@ -3749,7 +3749,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
         pThis->CallCallback( SALEVENT_RESIZE, NULL );
 
     if (bSized)
-        TriggerPaintEvent();
+        pThis->TriggerPaintEvent();
     return false;
 }
 
@@ -3925,7 +3925,7 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame
     if( (pThis->m_nState & GDK_WINDOW_STATE_ICONIFIED) != (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED ) )
     {
         GtkSalFrame::getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_RESIZE );
-        TriggerPaintEvent();
+        pThis->TriggerPaintEvent();
     }
 
     if(   (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_MAXIMIZED) &&