AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-06-24 01:20:33 +00:00
parent e2478fde62
commit 505f0a85c9
7 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cocoa/app.mm
View File

@ -44,7 +44,6 @@
// globals // globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxApp *wxTheApp = NULL;
wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
@interface wxPoserNSApplication : NSApplication @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 #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

5
src/mac/app.cpp
View File

@ -82,8 +82,6 @@ static EventTime sleepTime = kEventDurationNoWait ;
static long sleepTime = 0 ; static long sleepTime = 0 ;
#endif #endif
wxApp *wxTheApp = NULL;
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(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() wxApp::wxApp()
{ {
m_topWindow = NULL; m_topWindow = NULL;

5
src/mac/carbon/app.cpp
View File

@ -82,8 +82,6 @@ static EventTime sleepTime = kEventDurationNoWait ;
static long sleepTime = 0 ; static long sleepTime = 0 ;
#endif #endif
wxApp *wxTheApp = NULL;
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(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() wxApp::wxApp()
{ {
m_topWindow = NULL; m_topWindow = NULL;

6
src/mgl/app.cpp
View File

@ -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() void wxApp::Exit()
{ {
MGL_exit(); MGL_exit();

5
src/motif/app.cpp
View File

@ -66,8 +66,6 @@ static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
extern wxList wxPendingDelete; extern wxList wxPendingDelete;
extern bool wxAddIdleCallback(); extern bool wxAddIdleCallback();
wxApp *wxTheApp = NULL;
wxHashTable *wxWidgetHashTable = NULL; wxHashTable *wxWidgetHashTable = NULL;
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) 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() wxApp::wxApp()
{ {
argc = 0; argc = 0;

6
src/os2/app.cpp
View File

@ -94,7 +94,6 @@ extern wxCursor* g_globalCursor;
HAB vHabmain = NULLHANDLE; HAB vHabmain = NULLHANDLE;
QMSG svCurrentMsg; 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; return TRUE;
} // end of wxApp::OnInitGui } // end of wxApp::OnInitGui
//
// Static member initialization
//
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
wxApp::wxApp() wxApp::wxApp()
{ {
m_topWindow = NULL; m_topWindow = NULL;

5
src/x11/app.cpp
View File

@ -49,8 +49,6 @@ extern wxList wxPendingDelete;
wxHashTable *wxWidgetHashTable = NULL; wxHashTable *wxWidgetHashTable = NULL;
wxHashTable *wxClientWidgetHashTable = NULL; wxHashTable *wxClientWidgetHashTable = NULL;
wxApp *wxTheApp = NULL;
// This is set within wxEntryStart -- too early on // This is set within wxEntryStart -- too early on
// to put these in wxTheApp // to put these in wxTheApp
static bool g_showIconic = FALSE; 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() wxApp::wxApp()
{ {
// TODO: parse the command line // TODO: parse the command line