Applied patch [ 739401 ] gtk_init() has to be called before gdk_threads_enter()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -803,10 +803,11 @@ int wxEntryStart( int& argc, char *argv[] )
|
|||||||
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
|
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gdk_threads_enter();
|
|
||||||
|
|
||||||
gtk_init( &argc, &argv );
|
gtk_init( &argc, &argv );
|
||||||
|
|
||||||
|
/* we can not enter threads before gtk_init is done */
|
||||||
|
gdk_threads_enter();
|
||||||
|
|
||||||
wxSetDetectableAutoRepeat( TRUE );
|
wxSetDetectableAutoRepeat( TRUE );
|
||||||
|
|
||||||
if (!wxApp::Initialize())
|
if (!wxApp::Initialize())
|
||||||
|
@@ -803,10 +803,11 @@ int wxEntryStart( int& argc, char *argv[] )
|
|||||||
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
|
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gdk_threads_enter();
|
|
||||||
|
|
||||||
gtk_init( &argc, &argv );
|
gtk_init( &argc, &argv );
|
||||||
|
|
||||||
|
/* we can not enter threads before gtk_init is done */
|
||||||
|
gdk_threads_enter();
|
||||||
|
|
||||||
wxSetDetectableAutoRepeat( TRUE );
|
wxSetDetectableAutoRepeat( TRUE );
|
||||||
|
|
||||||
if (!wxApp::Initialize())
|
if (!wxApp::Initialize())
|
||||||
|
Reference in New Issue
Block a user