removed duplicate wxTheApp and m_appInitFn definitions from all ports, not just MSW

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

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index a63730b2eebf45d8214e53ecd357af46358c05af..d25e9d3230b0794f4142de624c50533df98be4f6 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -44,7 +44,6 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-wxApp *wxTheApp = NULL;

 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 
 @interface wxPoserNSApplication : NSApplication
 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 
 @interface wxPoserNSApplication : NSApplication


@@ -219,7 +218,6 @@ void wxApp::Exit()
 // ----------------------------------------------------------------------------
 // wxApp Static member initialization
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxApp Static member initialization
 // ----------------------------------------------------------------------------

-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 31ac4e6910bfd04a06763eae177042b795276b06..5f7d68f6bd97f5537665cb538e21b48cc2489750 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -82,8 +82,6 @@ static EventTime sleepTime = kEventDurationNoWait ;
 static long sleepTime = 0 ;
 #endif
 
 static long sleepTime = 0 ;
 #endif
 

-wxApp *wxTheApp = NULL;
-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)


@@ -1121,9 +1119,6 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even
 */
 #endif
 
 */
 #endif
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-

 wxApp::wxApp()
 {
   m_topWindow = NULL;
 wxApp::wxApp()
 {
   m_topWindow = NULL;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 31ac4e6910bfd04a06763eae177042b795276b06..5f7d68f6bd97f5537665cb538e21b48cc2489750 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -82,8 +82,6 @@ static EventTime sleepTime = kEventDurationNoWait ;
 static long sleepTime = 0 ;
 #endif
 
 static long sleepTime = 0 ;
 #endif
 

-wxApp *wxTheApp = NULL;
-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)


@@ -1121,9 +1119,6 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even
 */
 #endif
 
 */
 #endif
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-

 wxApp::wxApp()
 {
   m_topWindow = NULL;
 wxApp::wxApp()
 {
   m_topWindow = NULL;

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 149cd4e01c7f7a05159831418eb926731cb636de..1927ed786983a1e473d7a397d026d4422cbd7665 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -38,13 +38,9 @@
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------

-// Global data
+// wxApp::Exit()

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-wxApp *wxTheApp = NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
-

 void wxApp::Exit()
 {
     MGL_exit();
 void wxApp::Exit()
 {
     MGL_exit();

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 061f4c57a5e1bace687f7698f60fb0120ee85ffc..d7a0f97dbbe8400b75b485457604cd173f6b395a 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -66,8 +66,6 @@ static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
 extern wxList wxPendingDelete;
 extern bool wxAddIdleCallback();
 
 extern wxList wxPendingDelete;
 extern bool wxAddIdleCallback();
 

-wxApp *wxTheApp = NULL;
-

 wxHashTable *wxWidgetHashTable = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 wxHashTable *wxWidgetHashTable = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)


@@ -272,9 +270,6 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
     return retValue;
 }
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-

 wxApp::wxApp()
 {
     argc = 0;
 wxApp::wxApp()
 {
     argc = 0;

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index b9e0318b166c52afc43e23f13c9a4d673366693f..5db7a6bcfcbebf9d842d2f9ad9e7b96a08537adb 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -94,7 +94,6 @@ extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;
 QMSG                                svCurrentMsg;
 
 HAB                                 vHabmain = NULLHANDLE;
 QMSG                                svCurrentMsg;

-wxApp*                              wxTheApp = NULL;

 
 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;
 
 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;


@@ -662,11 +661,6 @@ bool wxApp::OnInitGui()
     return TRUE;
 } // end of wxApp::OnInitGui
 
     return TRUE;
 } // end of wxApp::OnInitGui
 

-//
-// Static member initialization
-//
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-

 wxApp::wxApp()
 {
     m_topWindow = NULL;
 wxApp::wxApp()
 {
     m_topWindow = NULL;

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 92c550e24126cc14f457dcaf3bbdf52a99fb9b4d..a75edfee09942b9abc180c00e352b1b722fd49c1 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -49,8 +49,6 @@ extern wxList wxPendingDelete;
 wxHashTable *wxWidgetHashTable = NULL;
 wxHashTable *wxClientWidgetHashTable = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 wxHashTable *wxClientWidgetHashTable = NULL;
 

-wxApp *wxTheApp = NULL;
-

 // This is set within wxEntryStart -- too early on
 // to put these in wxTheApp
 static bool g_showIconic = FALSE;
 // This is set within wxEntryStart -- too early on
 // to put these in wxTheApp
 static bool g_showIconic = FALSE;


@@ -361,9 +359,6 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 };
 
     return retValue;
 };
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-

 wxApp::wxApp()
 {
     // TODO: parse the command line
 wxApp::wxApp()
 {
     // TODO: parse the command line