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
This commit is contained in:
parent
e2478fde62
commit
505f0a85c9
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user