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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 877850f5fb307f64991638f6cc465740da72948a..11ab9c284f84978ee72878a462b6855518d9ee27 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -82,6 +82,7 @@ wxApp::wxApp()
   m_idleTag = 0;
   m_topWindow = NULL;
   m_exitOnFrameDelete = TRUE;
   m_idleTag = 0;
   m_topWindow = NULL;
   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) 
-{ 
-  return MainLoop(); 
+int wxApp::OnRun(void)
+{
+  return MainLoop();

 }
 
 bool wxApp::ProcessIdle(void)
 }
 
 bool wxApp::ProcessIdle(void)


@@ -110,7 +111,7 @@ bool wxApp::ProcessIdle(void)
   wxIdleEvent event;
   event.SetEventObject( this );
   ProcessEvent( event );
   wxIdleEvent event;
   event.SetEventObject( this );
   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)
   {
     wxObject *obj = (wxObject *)node->Data();
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();

-    
+

     delete obj;
 
     if (wxPendingDelete.Member(obj))
     delete obj;
 
     if (wxPendingDelete.Member(obj))


@@ -259,7 +260,7 @@ void wxApp::CommonInit(void)
   wxInitializeStockObjects();
 
   wxInitializeResourceSystem();
   wxInitializeStockObjects();
 
   wxInitializeResourceSystem();

-  
+

   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();
   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();


@@ -282,7 +283,7 @@ void wxApp::CommonCleanUp(void)
   wxDELETE(wxThePrintSetupData);
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
   wxDELETE(wxThePrintSetupData);
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();

-  
+

   wxFlushResources();
 
   wxDELETE(wxTheResourceCache);
   wxFlushResources();
 
   wxDELETE(wxTheResourceCache);


@@ -290,10 +291,10 @@ void wxApp::CommonCleanUp(void)
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();

-  
+

   wxSystemSettings::Done();
 }
   wxSystemSettings::Done();
 }

-    
+

 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;
 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;


@@ -308,7 +309,7 @@ int wxEntry( int argc, char *argv[] )
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();

-  
+

 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #if !defined(_WINDLL)
 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #if !defined(_WINDLL)


@@ -320,7 +321,7 @@ int wxEntry( int argc, char *argv[] )
   wxDebugContext::SetStream(oStr, sBuf);
 
 #endif
   wxDebugContext::SetStream(oStr, sBuf);
 
 #endif

-  
+

   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())


@@ -328,15 +329,15 @@ int wxEntry( int argc, char *argv[] )
       printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
       return 0;
     }
       printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
       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") );
     return 0;
   {
     printf( _("wxWindows error: wxTheApp == NULL\n") );
     return 0;


@@ -344,19 +345,19 @@ int wxEntry( int argc, char *argv[] )
 
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
 
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;

-  
+

   gtk_init( &argc, &argv );
 
 #ifdef USE_GDK_IMLIB
 
   gdk_imlib_init();
   gtk_init( &argc, &argv );
 
 #ifdef USE_GDK_IMLIB
 
   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();
 
   wxTheApp->OnInitGui();
   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();


@@ -364,23 +365,23 @@ int wxEntry( int argc, char *argv[] )
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().

-  
+

   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
   if (!wxTheApp->OnInit()) return 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();
 
   wxDELETE(wxTheApp);
   wxApp::CommonCleanUp();
 
   wxDELETE(wxTheApp);

-  
+

 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
   // At this point we want to check if there are any memory
   // blocks that aren't part of the wxDebugContext itself,
 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
   // At this point we want to check if there are any memory
   // blocks that aren't part of the wxDebugContext itself,


@@ -394,7 +395,7 @@ int wxEntry( int argc, char *argv[] )
   }
   wxDebugContext::SetStream(NULL, NULL);
 #endif
   }
   wxDebugContext::SetStream(NULL, NULL);
 #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
 

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 877850f5fb307f64991638f6cc465740da72948a..11ab9c284f84978ee72878a462b6855518d9ee27 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -82,6 +82,7 @@ wxApp::wxApp()
   m_idleTag = 0;
   m_topWindow = NULL;
   m_exitOnFrameDelete = TRUE;
   m_idleTag = 0;
   m_topWindow = NULL;
   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) 
-{ 
-  return MainLoop(); 
+int wxApp::OnRun(void)
+{
+  return MainLoop();

 }
 
 bool wxApp::ProcessIdle(void)
 }
 
 bool wxApp::ProcessIdle(void)


@@ -110,7 +111,7 @@ bool wxApp::ProcessIdle(void)
   wxIdleEvent event;
   event.SetEventObject( this );
   ProcessEvent( event );
   wxIdleEvent event;
   event.SetEventObject( this );
   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)
   {
     wxObject *obj = (wxObject *)node->Data();
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();

-    
+

     delete obj;
 
     if (wxPendingDelete.Member(obj))
     delete obj;
 
     if (wxPendingDelete.Member(obj))


@@ -259,7 +260,7 @@ void wxApp::CommonInit(void)
   wxInitializeStockObjects();
 
   wxInitializeResourceSystem();
   wxInitializeStockObjects();
 
   wxInitializeResourceSystem();

-  
+

   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();
   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();


@@ -282,7 +283,7 @@ void wxApp::CommonCleanUp(void)
   wxDELETE(wxThePrintSetupData);
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
   wxDELETE(wxThePrintSetupData);
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();

-  
+

   wxFlushResources();
 
   wxDELETE(wxTheResourceCache);
   wxFlushResources();
 
   wxDELETE(wxTheResourceCache);


@@ -290,10 +291,10 @@ void wxApp::CommonCleanUp(void)
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();

-  
+

   wxSystemSettings::Done();
 }
   wxSystemSettings::Done();
 }

-    
+

 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;
 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;


@@ -308,7 +309,7 @@ int wxEntry( int argc, char *argv[] )
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();

-  
+

 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #if !defined(_WINDLL)
 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #if !defined(_WINDLL)


@@ -320,7 +321,7 @@ int wxEntry( int argc, char *argv[] )
   wxDebugContext::SetStream(oStr, sBuf);
 
 #endif
   wxDebugContext::SetStream(oStr, sBuf);
 
 #endif

-  
+

   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())


@@ -328,15 +329,15 @@ int wxEntry( int argc, char *argv[] )
       printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
       return 0;
     }
       printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
       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") );
     return 0;
   {
     printf( _("wxWindows error: wxTheApp == NULL\n") );
     return 0;


@@ -344,19 +345,19 @@ int wxEntry( int argc, char *argv[] )
 
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
 
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;

-  
+

   gtk_init( &argc, &argv );
 
 #ifdef USE_GDK_IMLIB
 
   gdk_imlib_init();
   gtk_init( &argc, &argv );
 
 #ifdef USE_GDK_IMLIB
 
   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();
 
   wxTheApp->OnInitGui();
   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();


@@ -364,23 +365,23 @@ int wxEntry( int argc, char *argv[] )
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().

-  
+

   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
   if (!wxTheApp->OnInit()) return 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();
 
   wxDELETE(wxTheApp);
   wxApp::CommonCleanUp();
 
   wxDELETE(wxTheApp);

-  
+

 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
   // At this point we want to check if there are any memory
   // blocks that aren't part of the wxDebugContext itself,
 #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
   // At this point we want to check if there are any memory
   // blocks that aren't part of the wxDebugContext itself,


@@ -394,7 +395,7 @@ int wxEntry( int argc, char *argv[] )
   }
   wxDebugContext::SetStream(NULL, NULL);
 #endif
   }
   wxDebugContext::SetStream(NULL, NULL);
 #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