diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-06-14 17:15:31 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-14 17:15:54 +0100 |
| commit | 7d4213d4057bae31ba0446a8563613959af01edc (patch) | |
| tree | 3160a2a92971483205237743f03a03c4a7749f9a /vcl/unx/gtk/app/gtkinst.cxx | |
| parent | 0abc701a09b653ade8798fd9f2f6944f1b3ad6c7 (diff) | |
don't bomb out with gtk3 if we are expecting it
Diffstat (limited to 'vcl/unx/gtk/app/gtkinst.cxx')
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 69d3245dd15a..289ebc50a462 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -133,6 +133,11 @@ extern "C" VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule pModule ) { +#if OSL_DEBUG_LEVEL > 0 + fprintf( stderr, "create vcl plugin instance with gtk version %d %d %d\n", + (int) gtk_major_version, (int) gtk_minor_version, + (int) gtk_micro_version ); +#endif /* #i92121# workaround deadlocks in the X11 implementation */ static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" ); @@ -143,7 +148,11 @@ extern "C" if( ! ( pNoXInitThreads && *pNoXInitThreads ) ) XInitThreads(); +#if GTK_CHECK_VERSION(3,0,0) + const gchar* pVersion = gtk_check_version( 3, 0, 0 ); +#else const gchar* pVersion = gtk_check_version( 2, 2, 0 ); +#endif if( pVersion ) { #if OSL_DEBUG_LEVEL > 1 |