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

Added wxTheApp = this; to wxApp::wxApp for wxPython

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-08-18 19:57:02 +00:00
parent 4540e33bb6
commit 0cf2cb360f
2 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/gtk/app.cpp
View File

@@ -82,6 +82,7 @@ wxApp::wxApp()
m_idleTag = 0; m_idleTag = 0;
m_topWindow = NULL; m_topWindow = NULL;
m_exitOnFrameDelete = TRUE; m_exitOnFrameDelete = TRUE;
wxTheApp = this;
} }
wxApp::~wxApp(void) wxApp::~wxApp(void)
@@ -95,14 +96,14 @@ bool wxApp::OnInit(void)
} }
bool wxApp::OnInitGui(void) bool wxApp::OnInitGui(void)
{ {
m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
return TRUE; return TRUE;
} }
int wxApp::OnRun(void) int wxApp::OnRun(void)
{ {
return MainLoop(); return MainLoop();
} }
bool wxApp::ProcessIdle(void) bool wxApp::ProcessIdle(void)
@@ -110,7 +111,7 @@ bool wxApp::ProcessIdle(void)
wxIdleEvent event; wxIdleEvent event;
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
return event.MoreRequested(); return event.MoreRequested();
} }
@@ -200,12 +201,12 @@ bool wxApp::Initialized(void)
return m_initialized; return m_initialized;
} }
bool wxApp::Pending(void) bool wxApp::Pending(void)
{ {
return FALSE; return FALSE;
} }
void wxApp::Dispatch(void) void wxApp::Dispatch(void)
{ {
} }
@@ -215,7 +216,7 @@ void wxApp::DeletePendingObjects(void)
while (node) while (node)
{ {
wxObject *obj = (wxObject *)node->Data(); wxObject *obj = (wxObject *)node->Data();
delete obj; delete obj;
if (wxPendingDelete.Member(obj)) if (wxPendingDelete.Member(obj))
@@ -259,7 +260,7 @@ void wxApp::CommonInit(void)
wxInitializeStockObjects(); wxInitializeStockObjects();
wxInitializeResourceSystem(); wxInitializeResourceSystem();
// For PostScript printing // For PostScript printing
#if USE_POSTSCRIPT #if USE_POSTSCRIPT
wxInitializePrintSetupData(); wxInitializePrintSetupData();
@@ -282,7 +283,7 @@ void wxApp::CommonCleanUp(void)
wxDELETE(wxThePrintSetupData); wxDELETE(wxThePrintSetupData);
wxDELETE(wxTheFontNameDirectory); wxDELETE(wxTheFontNameDirectory);
wxDeleteStockObjects(); wxDeleteStockObjects();
wxFlushResources(); wxFlushResources();
wxDELETE(wxTheResourceCache); wxDELETE(wxTheResourceCache);
@@ -290,10 +291,10 @@ void wxApp::CommonCleanUp(void)
wxDeleteStockLists(); wxDeleteStockLists();
wxCleanUpResourceSystem(); wxCleanUpResourceSystem();
wxSystemSettings::Done(); wxSystemSettings::Done();
} }
wxLog *wxApp::CreateLogTarget() wxLog *wxApp::CreateLogTarget()
{ {
return new wxLogGui; return new wxLogGui;
@@ -308,7 +309,7 @@ int wxEntry( int argc, char *argv[] )
wxBuffer = new char[BUFSIZ + 512]; wxBuffer = new char[BUFSIZ + 512];
wxClassInfo::InitializeClasses(); wxClassInfo::InitializeClasses();
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
#if !defined(_WINDLL) #if !defined(_WINDLL)
@@ -320,7 +321,7 @@ int wxEntry( int argc, char *argv[] )
wxDebugContext::SetStream(oStr, sBuf); wxDebugContext::SetStream(oStr, sBuf);
#endif #endif
if (!wxTheApp) if (!wxTheApp)
{ {
if (!wxApp::GetInitializerFunction()) if (!wxApp::GetInitializerFunction())
@@ -328,15 +329,15 @@ int wxEntry( int argc, char *argv[] )
printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
return 0; return 0;
} }
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxObject *test_app = app_ini(); wxObject *test_app = app_ini();
wxTheApp = (wxApp*) test_app; wxTheApp = (wxApp*) test_app;
} }
if (!wxTheApp) if (!wxTheApp)
{ {
printf( _("wxWindows error: wxTheApp == NULL\n") ); printf( _("wxWindows error: wxTheApp == NULL\n") );
return 0; return 0;
@@ -344,19 +345,19 @@ int wxEntry( int argc, char *argv[] )
wxTheApp->argc = argc; wxTheApp->argc = argc;
wxTheApp->argv = argv; wxTheApp->argv = argv;
gtk_init( &argc, &argv ); gtk_init( &argc, &argv );
#ifdef USE_GDK_IMLIB #ifdef USE_GDK_IMLIB
gdk_imlib_init(); gdk_imlib_init();
gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_visual(gdk_imlib_get_visual());
gtk_widget_push_colormap(gdk_imlib_get_colormap()); gtk_widget_push_colormap(gdk_imlib_get_colormap());
#endif #endif
wxApp::CommonInit(); wxApp::CommonInit();
wxTheApp->OnInitGui(); wxTheApp->OnInitGui();
@@ -364,23 +365,23 @@ int wxEntry( int argc, char *argv[] )
// Here frames insert themselves automatically // Here frames insert themselves automatically
// into wxTopLevelWindows by getting created // into wxTopLevelWindows by getting created
// in OnInit(). // in OnInit().
if (!wxTheApp->OnInit()) return 0; if (!wxTheApp->OnInit()) return 0;
wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
int retValue = 0; int retValue = 0;
if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
wxTheApp->DeletePendingObjects(); wxTheApp->DeletePendingObjects();
wxTheApp->OnExit(); wxTheApp->OnExit();
wxApp::CommonCleanUp(); wxApp::CommonCleanUp();
wxDELETE(wxTheApp); wxDELETE(wxTheApp);
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
// At this point we want to check if there are any memory // At this point we want to check if there are any memory
// blocks that aren't part of the wxDebugContext itself, // blocks that aren't part of the wxDebugContext itself,
@@ -394,7 +395,7 @@ int wxEntry( int argc, char *argv[] )
} }
wxDebugContext::SetStream(NULL, NULL); wxDebugContext::SetStream(NULL, NULL);
#endif #endif
return retValue; return retValue;
} }
@@ -402,7 +403,7 @@ int wxEntry( int argc, char *argv[] )
// main() // main()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if defined(AIX) || defined(AIX4) || defined(____HPUX__) #if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
// main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h

73
src/gtk1/app.cpp
View File

@@ -82,6 +82,7 @@ wxApp::wxApp()
m_idleTag = 0; m_idleTag = 0;
m_topWindow = NULL; m_topWindow = NULL;
m_exitOnFrameDelete = TRUE; m_exitOnFrameDelete = TRUE;
wxTheApp = this;
} }
wxApp::~wxApp(void) wxApp::~wxApp(void)
@@ -95,14 +96,14 @@ bool wxApp::OnInit(void)
} }
bool wxApp::OnInitGui(void) bool wxApp::OnInitGui(void)
{ {
m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
return TRUE; return TRUE;
} }
int wxApp::OnRun(void) int wxApp::OnRun(void)
{ {
return MainLoop(); return MainLoop();
} }
bool wxApp::ProcessIdle(void) bool wxApp::ProcessIdle(void)
@@ -110,7 +111,7 @@ bool wxApp::ProcessIdle(void)
wxIdleEvent event; wxIdleEvent event;
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
return event.MoreRequested(); return event.MoreRequested();
} }
@@ -200,12 +201,12 @@ bool wxApp::Initialized(void)
return m_initialized; return m_initialized;
} }
bool wxApp::Pending(void) bool wxApp::Pending(void)
{ {
return FALSE; return FALSE;
} }
void wxApp::Dispatch(void) void wxApp::Dispatch(void)
{ {
} }
@@ -215,7 +216,7 @@ void wxApp::DeletePendingObjects(void)
while (node) while (node)
{ {
wxObject *obj = (wxObject *)node->Data(); wxObject *obj = (wxObject *)node->Data();
delete obj; delete obj;
if (wxPendingDelete.Member(obj)) if (wxPendingDelete.Member(obj))
@@ -259,7 +260,7 @@ void wxApp::CommonInit(void)
wxInitializeStockObjects(); wxInitializeStockObjects();
wxInitializeResourceSystem(); wxInitializeResourceSystem();
// For PostScript printing // For PostScript printing
#if USE_POSTSCRIPT #if USE_POSTSCRIPT
wxInitializePrintSetupData(); wxInitializePrintSetupData();
@@ -282,7 +283,7 @@ void wxApp::CommonCleanUp(void)
wxDELETE(wxThePrintSetupData); wxDELETE(wxThePrintSetupData);
wxDELETE(wxTheFontNameDirectory); wxDELETE(wxTheFontNameDirectory);
wxDeleteStockObjects(); wxDeleteStockObjects();
wxFlushResources(); wxFlushResources();
wxDELETE(wxTheResourceCache); wxDELETE(wxTheResourceCache);
@@ -290,10 +291,10 @@ void wxApp::CommonCleanUp(void)
wxDeleteStockLists(); wxDeleteStockLists();
wxCleanUpResourceSystem(); wxCleanUpResourceSystem();
wxSystemSettings::Done(); wxSystemSettings::Done();
} }
wxLog *wxApp::CreateLogTarget() wxLog *wxApp::CreateLogTarget()
{ {
return new wxLogGui; return new wxLogGui;
@@ -308,7 +309,7 @@ int wxEntry( int argc, char *argv[] )
wxBuffer = new char[BUFSIZ + 512]; wxBuffer = new char[BUFSIZ + 512];
wxClassInfo::InitializeClasses(); wxClassInfo::InitializeClasses();
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
#if !defined(_WINDLL) #if !defined(_WINDLL)
@@ -320,7 +321,7 @@ int wxEntry( int argc, char *argv[] )
wxDebugContext::SetStream(oStr, sBuf); wxDebugContext::SetStream(oStr, sBuf);
#endif #endif
if (!wxTheApp) if (!wxTheApp)
{ {
if (!wxApp::GetInitializerFunction()) if (!wxApp::GetInitializerFunction())
@@ -328,15 +329,15 @@ int wxEntry( int argc, char *argv[] )
printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
return 0; return 0;
} }
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxObject *test_app = app_ini(); wxObject *test_app = app_ini();
wxTheApp = (wxApp*) test_app; wxTheApp = (wxApp*) test_app;
} }
if (!wxTheApp) if (!wxTheApp)
{ {
printf( _("wxWindows error: wxTheApp == NULL\n") ); printf( _("wxWindows error: wxTheApp == NULL\n") );
return 0; return 0;
@@ -344,19 +345,19 @@ int wxEntry( int argc, char *argv[] )
wxTheApp->argc = argc; wxTheApp->argc = argc;
wxTheApp->argv = argv; wxTheApp->argv = argv;
gtk_init( &argc, &argv ); gtk_init( &argc, &argv );
#ifdef USE_GDK_IMLIB #ifdef USE_GDK_IMLIB
gdk_imlib_init(); gdk_imlib_init();
gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_visual(gdk_imlib_get_visual());
gtk_widget_push_colormap(gdk_imlib_get_colormap()); gtk_widget_push_colormap(gdk_imlib_get_colormap());
#endif #endif
wxApp::CommonInit(); wxApp::CommonInit();
wxTheApp->OnInitGui(); wxTheApp->OnInitGui();
@@ -364,23 +365,23 @@ int wxEntry( int argc, char *argv[] )
// Here frames insert themselves automatically // Here frames insert themselves automatically
// into wxTopLevelWindows by getting created // into wxTopLevelWindows by getting created
// in OnInit(). // in OnInit().
if (!wxTheApp->OnInit()) return 0; if (!wxTheApp->OnInit()) return 0;
wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
int retValue = 0; int retValue = 0;
if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
wxTheApp->DeletePendingObjects(); wxTheApp->DeletePendingObjects();
wxTheApp->OnExit(); wxTheApp->OnExit();
wxApp::CommonCleanUp(); wxApp::CommonCleanUp();
wxDELETE(wxTheApp); wxDELETE(wxTheApp);
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
// At this point we want to check if there are any memory // At this point we want to check if there are any memory
// blocks that aren't part of the wxDebugContext itself, // blocks that aren't part of the wxDebugContext itself,
@@ -394,7 +395,7 @@ int wxEntry( int argc, char *argv[] )
} }
wxDebugContext::SetStream(NULL, NULL); wxDebugContext::SetStream(NULL, NULL);
#endif #endif
return retValue; return retValue;
} }
@@ -402,7 +403,7 @@ int wxEntry( int argc, char *argv[] )
// main() // main()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if defined(AIX) || defined(AIX4) || defined(____HPUX__) #if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
// main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h