diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-02 13:54:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-02 13:54:21 +0000 |
| commit | 3e8eb3c9fa583f19021c5b2629d7692dc665a18c (patch) | |
| tree | d644ac8f033b57589855679c9ad1b5930729c82b /vcl/unx/gtk | |
| parent | 4df4eb3d10fb3be5f6c3080980358be47f9c690b (diff) | |
#i29781# gtk version (joined from CWS vcl23)
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 71901b7b8fa0..b95d8fe586f0 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gtkdata.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-05-10 15:52:09 $ + * last change: $Author: rt $ $Date: 2004-06-02 14:54:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -410,6 +410,7 @@ GtkXLib::GtkXLib() m_pGtkSalDisplay = NULL; m_pTimeout = NULL; m_nTimeoutMs = 0; + m_pUserEvent = NULL; } GtkXLib::~GtkXLib() @@ -471,7 +472,7 @@ void GtkXLib::Init() for (i = 0; i < nParams; i++ ) g_free( pCmdLineAry[i] ); - delete pCmdLineAry; + delete [] pCmdLineAry; #if OSL_DEBUG_LEVEL > 1 if (g_getenv ("SAL_DEBUG_UPDATES")) @@ -628,6 +629,7 @@ void GtkXLib::PostUserEvent() (gpointer) this, NULL); g_source_attach (m_pUserEvent, g_main_context_default ()); } + Wakeup(); } void GtkXLib::Wakeup() diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 6af65e2b808a..5c2634dedbf1 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gtkinst.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-05-10 15:52:22 $ + * last change: $Author: rt $ $Date: 2004-06-02 14:53:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,6 +155,15 @@ extern "C" SalInstance* create_SalInstance( oslModule pModule ) { + const gchar* pVersion = gtk_check_version( 2, 2, 0 ); + if( pVersion ) + { +#if OSL_DEBUG_LEVEL > 1 + fprintf( stderr, "gtk version conflict: %s\n", pVersion ); +#endif + return NULL; + } + GtkYieldMutex *pYieldMutex; // init gdk thread protection |