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

Changed wxRootWindow from a global to a staic variable with an

Browse Source 
accessor function that initializes if on first use.  This prevents
core dumps for apps that try to create wxBitmaps before the wxApp
object is initialized.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-05-11 17:55:28 +00:00
parent a90c95aa8e
commit c2fa61e833
12 changed files with 234 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gtk1/app.cpp
View File

@@ -52,7 +52,7 @@ extern bool g_isIdle;
bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0;
GtkWidget *wxRootWindow = (GtkWidget*) NULL;
static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
//-----------------------------------------------------------------------------
// local functions
@@ -92,11 +92,11 @@ bool wxYield()
}
#endif // wxUSE_THREADS
#ifdef __WXDEBUG__
#ifdef __WXDEBUG__
if (gs_inYield)
wxFAIL_MSG( wxT("wxYield called recursively" ) );
#endif
gs_inYield = TRUE;
if (!g_isIdle)
@@ -137,8 +137,8 @@ bool wxYieldIfNeeded()
{
if (gs_inYield)
return FALSE;
return wxYield();
return wxYield();
}
//-----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ void 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
@@ -195,7 +195,7 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) )
gint wxapp_idle_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
@@ -228,7 +228,7 @@ void wxapp_install_idle_handler()
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
@@ -245,7 +245,7 @@ static int g_threadUninstallLevel = 0;
void wxapp_install_thread_wakeup()
{
g_threadUninstallLevel++;
if (g_threadUninstallLevel != 1) return;
if (wxTheApp->m_wakeUpTimerTag) return;
@@ -256,7 +256,7 @@ void wxapp_install_thread_wakeup()
void wxapp_uninstall_thread_wakeup()
{
g_threadUninstallLevel--;
if (g_threadUninstallLevel != 0) return;
if (!wxTheApp->m_wakeUpTimerTag) return;
@@ -626,6 +626,19 @@ void wxApp::CleanUp()
#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
//-----------------------------------------------------------------------------
@@ -676,6 +689,7 @@ int wxEntryStart( int argc, char *argv[] )
return 0;
}
int wxEntryInitGui()
{
int retValue = 0;
@@ -683,8 +697,7 @@ int wxEntryInitGui()
if ( !wxTheApp->OnInitGui() )
retValue = -1;
wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_realize( wxRootWindow );
wxGetRootWindow();
return retValue;
}