diff options
Diffstat (limited to 'vcl/unx/gtk/app/gtkdata.cxx')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 950dbcbea0b6..cf21f6e73ffc 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -274,7 +274,7 @@ void GtkSalDisplay::initScreen( int nScreen ) const ScreenData& rSD = const_cast<ScreenData&>(m_aScreens[nScreen]); if( rSD.m_bInit ) return; - + // choose visual for screen SalDisplay::initScreen( nScreen ); // now set a gdk default colormap matching the chosen visual to the screen @@ -518,7 +518,7 @@ class GtkXLib : public SalXLib GtkSalDisplay *m_pGtkSalDisplay; std::list<GSource *> m_aSources; GSource *m_pTimeout; - GSource *m_pUserEvent; + GSource *m_pUserEvent; oslMutex m_aDispatchMutex; oslCondition m_aDispatchCondition; XIOErrorHandler m_aOrigGTKXIOErrorHandler; @@ -533,9 +533,9 @@ public: virtual void Init(); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); virtual void Insert( int fd, void* data, - YieldFunc pending, - YieldFunc queued, - YieldFunc handle ); + YieldFunc pending, + YieldFunc queued, + YieldFunc handle ); virtual void Remove( int fd ); virtual void StartTimer( ULONG nMS ); @@ -629,7 +629,7 @@ void GtkXLib::Init() rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc); g_set_prgname(aPrgName); } - + // init gtk/gdk gtk_init_check( &nParams, &pCmdLineAry ); @@ -692,7 +692,7 @@ void GtkXLib::Init() m_pGtkSalDisplay->SetKbdExtension( pKbdExtension ); g_signal_connect( G_OBJECT(gdk_keymap_get_default()), "keys_changed", G_CALLBACK(signalKeysChanged), m_pGtkSalDisplay ); - + // add signal handler to notify screen size changes int nScreens = gdk_display_get_n_screens( pGdkDisp ); for( int n = 0; n < nScreens; n++ ) @@ -756,7 +756,7 @@ void GtkXLib::StartTimer( ULONG nMS ) g_source_set_callback (m_pTimeout, call_timeoutFn, (gpointer) this, NULL); g_source_attach (m_pTimeout, g_main_context_default ()); - + SalXLib::StartTimer( nMS ); } @@ -837,7 +837,7 @@ void GtkXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) * another thread in in there. Having only one yieldin thread actually dispatch * fits the vcl event model (see e.g. the generic plugin). */ - + bool bDispatchThread = false; gboolean wasEvent = FALSE; { @@ -848,7 +848,7 @@ void GtkXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) else if( ! bWait ) return; // someone else is waiting already, return - + if( bDispatchThread ) { int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1; |