Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gtk_init_check instead of gtk_init so that we can racefully exit

Browse Source 
(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
This commit is contained in:
Robin Dunn
2004-05-21 00:14:10 +00:00
parent 97698dc4fe
commit c156411a08
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/app.cpp
View File

@@ -543,6 +543,8 @@ GdkVisual *wxApp::GetGdkVisual()
bool wxApp::Initialize(int& argc, wxChar **argv) bool wxApp::Initialize(int& argc, wxChar **argv)
{ {
bool init_result;
#if wxUSE_THREADS #if wxUSE_THREADS
// GTK 1.2 up to version 1.2.3 has broken threads // GTK 1.2 up to version 1.2.3 has broken threads
if ((gtk_major_version == 1) && if ((gtk_major_version == 1) &&
@@ -588,9 +590,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
int argcGTK = argc; int argcGTK = argc;
#ifdef __WXGPE__ #ifdef __WXGPE__
init_result = true; // is there a _check() version of this?
gpe_application_init( &argcGTK, &argvGTK ); gpe_application_init( &argcGTK, &argvGTK );
#else #else
gtk_init( &argcGTK, &argvGTK ); init_result = gtk_init_check( &argcGTK, &argvGTK );
#endif #endif
if ( argcGTK != argc ) if ( argcGTK != argc )
@@ -618,9 +621,14 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
#else // !wxUSE_UNICODE #else // !wxUSE_UNICODE
// gtk_init() shouldn't actually change argv itself (just its contents) so // gtk_init() shouldn't actually change argv itself (just its contents) so
// it's ok to pass pointer to it // it's ok to pass pointer to it
gtk_init( &argc, &argv ); init_result = gtk_init_check( &argc, &argv );
#endif // wxUSE_UNICODE/!wxUSE_UNICODE #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 // we can not enter threads before gtk_init is done
gdk_threads_enter(); gdk_threads_enter();

12
src/gtk1/app.cpp
View File

@@ -543,6 +543,8 @@ GdkVisual *wxApp::GetGdkVisual()
bool wxApp::Initialize(int& argc, wxChar **argv) bool wxApp::Initialize(int& argc, wxChar **argv)
{ {
bool init_result;
#if wxUSE_THREADS #if wxUSE_THREADS
// GTK 1.2 up to version 1.2.3 has broken threads // GTK 1.2 up to version 1.2.3 has broken threads
if ((gtk_major_version == 1) && if ((gtk_major_version == 1) &&
@@ -588,9 +590,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
int argcGTK = argc; int argcGTK = argc;
#ifdef __WXGPE__ #ifdef __WXGPE__
init_result = true; // is there a _check() version of this?
gpe_application_init( &argcGTK, &argvGTK ); gpe_application_init( &argcGTK, &argvGTK );
#else #else
gtk_init( &argcGTK, &argvGTK ); init_result = gtk_init_check( &argcGTK, &argvGTK );
#endif #endif
if ( argcGTK != argc ) if ( argcGTK != argc )
@@ -618,9 +621,14 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
#else // !wxUSE_UNICODE #else // !wxUSE_UNICODE
// gtk_init() shouldn't actually change argv itself (just its contents) so // gtk_init() shouldn't actually change argv itself (just its contents) so
// it's ok to pass pointer to it // it's ok to pass pointer to it
gtk_init( &argc, &argv ); init_result = gtk_init_check( &argc, &argv );
#endif // wxUSE_UNICODE/!wxUSE_UNICODE #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 // we can not enter threads before gtk_init is done
gdk_threads_enter(); gdk_threads_enter();