From: Robin Dunn <robin@alldunn.com>
Date: Fri, 21 May 2004 00:14:10 +0000 (+0000)
Subject: Use gtk_init_check instead of gtk_init so that we can racefully exit
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c156411a0886a4b49a0c30c36153fb3c1edd4b51?ds=inline

Use gtk_init_check instead of gtk_init so that we can racefully exit
(i.e. raise an exception in wxPython) instead of just terminating the
app.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index fee3c423dc..c258135bab 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -543,6 +543,8 @@ GdkVisual *wxApp::GetGdkVisual()
 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
+    bool init_result;
+    
 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&
@@ -588,9 +590,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     int argcGTK = argc;
     
 #ifdef __WXGPE__
+    init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #else
-    gtk_init( &argcGTK, &argvGTK );
+    init_result = gtk_init_check( &argcGTK, &argvGTK );
 #endif
 
     if ( argcGTK != argc )
@@ -618,9 +621,14 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else // !wxUSE_UNICODE
     // gtk_init() shouldn't actually change argv itself (just its contents) so
     // it's ok to pass pointer to it
-    gtk_init( &argc, &argv );
+    init_result = gtk_init_check( &argc, &argv );
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
+    if (!init_result) {
+        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+        return false;
+    }
+    
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();
 
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index fee3c423dc..c258135bab 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -543,6 +543,8 @@ GdkVisual *wxApp::GetGdkVisual()
 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
+    bool init_result;
+    
 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&
@@ -588,9 +590,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     int argcGTK = argc;
     
 #ifdef __WXGPE__
+    init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #else
-    gtk_init( &argcGTK, &argvGTK );
+    init_result = gtk_init_check( &argcGTK, &argvGTK );
 #endif
 
     if ( argcGTK != argc )
@@ -618,9 +621,14 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else // !wxUSE_UNICODE
     // gtk_init() shouldn't actually change argv itself (just its contents) so
     // it's ok to pass pointer to it
-    gtk_init( &argc, &argv );
+    init_result = gtk_init_check( &argc, &argv );
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
+    if (!init_result) {
+        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+        return false;
+    }
+    
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();