bool g_mainThreadLocked = FALSE;
+GtkWidget *wxRootWindow = (GtkWidget*) NULL;
+
//-----------------------------------------------------------------------------
// local functions
//-----------------------------------------------------------------------------
while (gtk_events_pending())
gtk_main_iteration();
+ if (has_idle)
+ {
+ /* re-add idle handler (very low priority) */
+ wxTheApp->m_idleTag = gtk_idle_add_priority( 500, wxapp_idle_callback, (gpointer) NULL );
+ }
+
+ // disable log flushing from here because a call to wxYield() shouldn't
+ // normally result in message boxes popping up &c
+ wxLog::Suspend();
+
/* it's necessary to call ProcessIdle() to update the frames sizes which
might have been changed (it also will update other things set from
OnUpdateUI() which is a nice (and desired) side effect) */
- while (wxTheApp->ProcessIdle()) { }
+ while (wxTheApp->ProcessIdle())
+ ;
- if (has_idle)
- {
- /* re-add idle handler */
- wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
- }
+ // let the logs be flashed again
+ wxLog::Resume();
return TRUE;
}
wxMutexGuiEnter();
#endif
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
-
+
#if wxUSE_THREADS
if (!wxThread::IsMain())
wxMutexGuiLeave();
// thread so we must lock it here ourselves
gdk_threads_enter();
- /* sent idle event to all who request them */
- while (wxTheApp->ProcessIdle()) { }
-
/* we don't want any more idle events until the next event is
sent to wxGTK */
gtk_idle_remove( wxTheApp->m_idleTag );
emptied */
g_isIdle = TRUE;
+ /* sent idle event to all who request them */
+ while (wxTheApp->ProcessIdle()) { }
+
// release lock again
gdk_threads_leave();
indicating that the idle is over. It may also
get called from other thread for sending events
to the main thread (and processing these in
- idle time). */
+ idle time). Very low priority. */
- wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+ wxTheApp->m_idleTag = gtk_idle_add_priority( 500, wxapp_idle_callback, (gpointer) NULL );
g_isIdle = FALSE;
}
// unblock other threads wishing to do some GUI things
wxMutexGuiLeave();
-
+
g_mainThreadLocked = TRUE;
// wake up other threads
// release lock again
gdk_threads_leave();
-
+
return TRUE;
}
#endif
m_colorCube = (unsigned char*) NULL;
+
+ m_useBestVisual = FALSE;
}
wxApp::~wxApp()
/* on some machines, the default visual is just 256 colours, so
we make sure we get the best. this can sometimes be wasteful,
of course, but what do these guys pay $30.000 for? */
-/*
- if (gdk_visual_get_best() != gdk_visual_get_system())
+
+ if ((gdk_visual_get_best() != gdk_visual_get_system()) &&
+ (m_useBestVisual))
{
GdkVisual* vis = gdk_visual_get_best();
gtk_widget_set_default_visual( vis );
visual = vis;
}
-*/
/* Nothing to do for 15, 16, 24, 32 bit displays */
if (visual->depth > 8) return TRUE;
/* 'Garbage' collection of windows deleted with Close(). */
DeletePendingObjects();
- /* flush the logged messages if any */
-#if wxUSE_LOG
- wxLog *log = wxLog::GetActiveTarget();
- if (log != NULL && log->HasPendingMessages())
- log->Flush();
-#endif // wxUSE_LOG
-
/* Send OnIdle events to all windows */
bool needMore = SendIdleEvents();
event.RequestMore(TRUE);
s_inOnIdle = FALSE;
+
+ /* flush the logged messages if any */
+#if wxUSE_LOG
+ wxLog::FlushActive();
+#endif // wxUSE_LOG
}
bool wxApp::SendIdleEvents()
if (wxTheColourDatabase)
delete wxTheColourDatabase;
-
+
wxTheColourDatabase = (wxColourDatabase*) NULL;
wxDeleteStockObjects();
// wxEntry
//-----------------------------------------------------------------------------
-int wxEntry( int argc, char *argv[] )
+
+int wxEntryStart( int argc, char *argv[] )
{
#if wxUSE_THREADS
- g_thread_init(NULL);
+ /* GTK 1.2 up to version 1.2.3 has broken threads */
+ if ((gtk_major_version == 1) &&
+ (gtk_minor_version == 2) &&
+ (gtk_micro_version < 4))
+ {
+ printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+ }
+ else
+ {
+ g_thread_init(NULL);
+ }
#endif
-
+
gtk_set_locale();
#if wxUSE_WCHAR_T
return -1;
}
+ return 0;
+}
+
+
+int wxEntryInitGui()
+{
+ int retValue = 0;
+
+ if ( !wxTheApp->OnInitGui() )
+ retValue = -1;
+
+ wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+ gtk_widget_realize( wxRootWindow );
+
+ return retValue;
+}
+
+
+void wxEntryCleanup()
+{
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog *log = wxLog::GetActiveTarget();
+ if (log != NULL && log->HasPendingMessages())
+ log->Flush();
+
+ // continuing to use user defined log target is unsafe from now on because
+ // some resources may be already unavailable, so replace it by something
+ // more safe
+ wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
+ if ( oldlog )
+ delete oldlog;
+#endif // wxUSE_LOG
+
+ wxApp::CleanUp();
+
+ gdk_threads_leave();
+}
+
+
+
+int wxEntry( int argc, char *argv[] )
+{
+ int err;
+
+ err = wxEntryStart(argc, argv);
+ if (err)
+ return err;
+
if (!wxTheApp)
{
wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
#if wxUSE_UNICODE
wxTheApp->argv = new wxChar*[argc+1];
int mb_argc = 0;
- while (mb_argc < argc)
+ while (mb_argc < argc)
{
wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
mb_argc++;
wxStripExtension( name );
wxTheApp->SetAppName( name );
- int retValue = 0;
-
- if ( !wxTheApp->OnInitGui() )
- retValue = -1;
+ int retValue;
+ retValue = wxEntryInitGui();
// Here frames insert themselves automatically into wxTopLevelWindows by
// getting created in OnInit().
if (wxTheApp->Initialized())
{
- retValue = wxTheApp->OnRun();
+ wxTheApp->OnRun();
wxWindow *topWindow = wxTheApp->GetTopWindow();
if (topWindow)
wxTheApp->SetTopWindow( (wxWindow*) NULL );
}
}
- wxTheApp->OnExit();
+
+ retValue = wxTheApp->OnExit();
}
}
-#if wxUSE_LOG
- // flush the logged messages if any
- wxLog *log = wxLog::GetActiveTarget();
- if (log != NULL && log->HasPendingMessages())
- log->Flush();
-
- // continuing to use user defined log target is unsafe from now on because
- // some resources may be already unavailable, so replace it by something
- // more safe
- wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
- if ( oldlog )
- delete oldlog;
-#endif // wxUSE_LOG
-
- wxApp::CleanUp();
-
- gdk_threads_leave();
+ wxEntryCleanup();
return retValue;
}
projects / wxWidgets.git / blobdiff