From 505f0a85c9b59d8be30f2be1f7cf4fd3d663f721 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Jun 2003 01:20:33 +0000
Subject: [PATCH] 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
---
 src/cocoa/app.mm       | 2 --
 src/mac/app.cpp        | 5 -----
 src/mac/carbon/app.cpp | 5 -----
 src/mgl/app.cpp        | 6 +-----
 src/motif/app.cpp      | 5 -----
 src/os2/app.cpp        | 6 ------
 src/x11/app.cpp        | 5 -----
 7 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index a63730b2ee..d25e9d3230 100644
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -44,7 +44,6 @@
 // globals
 // ----------------------------------------------------------------------------
 
-wxApp *wxTheApp = NULL;
 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 
 @interface wxPoserNSApplication : NSApplication
@@ -219,7 +218,6 @@ void wxApp::Exit()
 // ----------------------------------------------------------------------------
 // wxApp Static member initialization
 // ----------------------------------------------------------------------------
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 31ac4e6910..5f7d68f6bd 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -82,8 +82,6 @@ static EventTime sleepTime = kEventDurationNoWait ;
 static long sleepTime = 0 ;
 #endif
 
-wxApp *wxTheApp = NULL;
-
 #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
 
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
   m_topWindow = NULL;
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 31ac4e6910..5f7d68f6bd 100644
--- 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
 
-wxApp *wxTheApp = NULL;
-
 #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
 
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
   m_topWindow = NULL;
diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 149cd4e01c..1927ed7869 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -38,13 +38,9 @@
 #include "wx/mgl/private.h"
 
 //-----------------------------------------------------------------------------
-// Global data
+// wxApp::Exit()
 //-----------------------------------------------------------------------------
 
-wxApp *wxTheApp = NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
-
 void wxApp::Exit()
 {
     MGL_exit();
diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 061f4c57a5..d7a0f97dbb 100644
--- 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();
 
-wxApp *wxTheApp = NULL;
-
 wxHashTable *wxWidgetHashTable = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
@@ -272,9 +270,6 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
     argc = 0;
diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index b9e0318b16..5db7a6bcfc 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -94,7 +94,6 @@ extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;
 QMSG                                svCurrentMsg;
-wxApp*                              wxTheApp = NULL;
 
 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;
@@ -662,11 +661,6 @@ bool wxApp::OnInitGui()
     return TRUE;
 } // end of wxApp::OnInitGui
 
-//
-// Static member initialization
-//
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
     m_topWindow = NULL;
diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 92c550e241..a75edfee09 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -49,8 +49,6 @@ extern wxList wxPendingDelete;
 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;
@@ -361,9 +359,6 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 };
 
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
     // TODO: parse the command line
-- 
2.45.2