Kaydet (Commit) 83076579 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

AllocateFrame() and TriggerPaintEvent() can't be static when --enable-gtk3

Change-Id: I1d637285b6b6ef64b83ab759bd4a379713bbf96b
üst 2b1bd0fa
......@@ -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 );
......
......@@ -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) &&
......
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