bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0;
-GtkWidget *wxRootWindow = (GtkWidget*) NULL;
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
//-----------------------------------------------------------------------------
// local functions
// wxYield
//-----------------------------------------------------------------------------
+static bool gs_inYield = FALSE;
+
bool wxYield()
{
+#if wxUSE_THREADS
+ if ( !wxThread::IsMain() )
+ {
+ // can't call gtk_main_iteration() from other threads like this
+ return TRUE;
+ }
+#endif // wxUSE_THREADS
+
#ifdef __WXDEBUG__
- static bool s_inYield = FALSE;
-
- if (s_inYield)
+ if (gs_inYield)
wxFAIL_MSG( wxT("wxYield called recursively" ) );
-
- s_inYield = TRUE;
#endif
+ gs_inYield = TRUE;
+
if (!g_isIdle)
{
// We need to remove idle callbacks or the loop will
g_isIdle = TRUE;
}
- while (gtk_events_pending())
- gtk_main_iteration();
-
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
+ while (gtk_events_pending())
+ gtk_main_iteration();
+
/* 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) */
// let the logs be flashed again
wxLog::Resume();
-#ifdef __WXDEBUG__
- s_inYield = FALSE;
-#endif
+ gs_inYield = FALSE;
return TRUE;
}
+//-----------------------------------------------------------------------------
+// wxYieldIfNeeded
+// Like wxYield, but fails silently if the yield is recursive.
+//-----------------------------------------------------------------------------
+
+bool wxYieldIfNeeded()
+{
+ if (gs_inYield)
+ return FALSE;
+
+ return wxYield();
+}
+
//-----------------------------------------------------------------------------
// wxWakeUpIdle
//-----------------------------------------------------------------------------
gint wxapp_pending_callback( gpointer WXUNUSED(data) )
{
if (!wxTheApp) return TRUE;
-
+
// when getting called from GDK's time-out handler
// we are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
- if (!wxTheApp) return TRUE;
-
+ if (!wxTheApp)
+ return TRUE;
+
+#ifdef __WXDEBUG__
+ // don't generate the idle events while the assert modal dialog is shown,
+ // this completely confuses the apps which don't expect to be reentered
+ // from some safely-looking functions
+ if ( wxTheApp->IsInAssert() )
+ {
+ return TRUE;
+ }
+#endif // __WXDEBUG__
+
// when getting called from GDK's time-out handler
// we are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves
gdk_threads_enter();
- // Sent idle event to all who request them
- while (wxTheApp->ProcessIdle()) { }
-
/* Indicate that we are now in idle mode - even so deeply
in idle mode that we don't get any idle events anymore.
this is like wxMSW where an idle event is sent only
g_isIdle = TRUE;
wxTheApp->m_idleTag = 0;
+ // Sent idle event to all who request them as long as they do
+ while (wxTheApp->ProcessIdle())
+ ;
+
// Release lock again
gdk_threads_leave();
if (g_pendingTag == 0)
g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
-
+
/* This routine gets called by all event handlers
indicating that the idle is over. It may also
get called from other thread for sending events
void wxapp_install_thread_wakeup()
{
g_threadUninstallLevel++;
-
+
if (g_threadUninstallLevel != 1) return;
if (wxTheApp->m_wakeUpTimerTag) return;
void wxapp_uninstall_thread_wakeup()
{
g_threadUninstallLevel--;
-
+
if (g_threadUninstallLevel != 0) return;
if (!wxTheApp->m_wakeUpTimerTag) return;
wxApp::wxApp()
{
- wxTheApp = this;
-
- m_topWindow = (wxWindow *) NULL;
- m_exitOnFrameDelete = TRUE;
+ m_initialized = FALSE;
+#ifdef __WXDEBUG__
+ m_isInAssert = FALSE;
+#endif // __WXDEBUG__
m_idleTag = 0;
wxapp_install_idle_handler();
#endif
m_colorCube = (unsigned char*) NULL;
-
- m_useBestVisual = FALSE;
}
wxApp::~wxApp()
bool wxApp::OnInitGui()
{
+ if ( !wxAppBase::OnInitGui() )
+ return FALSE;
+
GdkVisual *visual = gdk_visual_get_system();
/* on some machines, the default visual is just 256 colours, so
wxClassInfo::InitializeClasses();
wxSystemSettings::Init();
+
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
// GL: I'm annoyed ... I don't know where to put this and I don't want to
// create a module for that as it's part of the core.
#endif // wxUSE_LOG
}
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
+{
+ if (gs_RootWindow == NULL) {
+ gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+ gtk_widget_realize( gs_RootWindow );
+ }
+ return gs_RootWindow;
+}
+
//-----------------------------------------------------------------------------
// wxEntry
//-----------------------------------------------------------------------------
gtk_set_locale();
+ // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
#if defined(__WXGTK20__)
// gtk+ 2.0 supports Unicode through UTF-8 strings
wxConvCurrent = &wxConvUTF8;
-#elif wxUSE_WCHAR_T
+#else
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#endif
#else
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
#endif
if ( !wxTheApp->OnInitGui() )
retValue = -1;
- wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_realize( wxRootWindow );
+ wxGetRootWindow();
return retValue;
}
return wxIcon(error_xpm);
}
}
+
+#ifdef __WXDEBUG__
+
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+{
+ m_isInAssert = TRUE;
+
+ wxAppBase::OnAssert(file, line, msg);
+
+ m_isInAssert = FALSE;
+}
+
+#endif // __WXDEBUG__
+
projects / wxWidgets.git / blobdiff