removed wxApp::Initialized() (replaced with a dummy version in wxApp itself); wxApp...

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

diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex
index 1137aa6ccdb4beadc1ebbc7bfdb72c04cebd9d4c..82d7d17f370ab5a340f0288467485f40282e6d00 100644 (file)
--- a/docs/latex/wx/app.tex
+++ b/docs/latex/wx/app.tex
@@ -196,17 +196,6 @@ You should normally exit the main loop (and the application) by deleting
 the top window.
 
 
-\membersection{wxApp::Initialized}\label{wxappinitialized}
-
-\func{bool}{Initialized}{\void}
-
-Returns true if the application has been initialized (i.e. if\rtfsp
-\helpref{wxApp::OnInit}{wxapponinit} has returned successfully).  This can be useful for error
-message routines to determine which method of output is best for the
-current state of the program (some windowing systems may not like
-dialogs to pop up before the main loop has been entered).
-
-
 \membersection{wxApp::MainLoop}\label{wxappmainloop}
 
 \func{int}{MainLoop}{\void}

diff --git a/include/wx/app.h b/include/wx/app.h
index 7c2b61c4e30b459f212bc414c1c14833948a51d1..f172a41422c536684bf72a25c586736cf6b3ad3a 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -380,10 +380,6 @@ public:
         // stop the program immediately!)
     virtual void ExitMainLoop();
 
-        // returns true if the program is initialized, i.e. OnInit() has been
-        // completed successfully
-    virtual bool Initialized() = 0;
-
         // returns TRUE if there are unprocessed events in the event queue
     virtual bool Pending();
 
@@ -491,6 +487,11 @@ public:
     // deactivated
     virtual void SetActive(bool isActive, wxWindow *lastFocus);
 
+    // OBSOLETE: don't use, always returns true
+    //
+    // returns true if the program is successfully initialized
+    bool Initialized() { return true; }
+
 
 protected:
     // delete all objects in wxPendingDelete list

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index d114405049b622faae3bb20c944cb22f84aee063..3dfca73c96f367fa5361bcedb95e08228c4c940e 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -48,7 +48,6 @@ public:
     // Implement wxAppBase pure virtuals
     virtual int MainLoop();
     virtual void ExitMainLoop();
-    virtual bool Initialized();
     virtual bool Pending();
     virtual bool Dispatch();
 

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index ad1496c96770b1d3bc1e7282f4a5c219c52f66bc..834aaa338e37e162b1e836fa556cc80939d028e1 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -41,13 +41,7 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
     virtual bool Initialized();
-    virtual bool Pending();
-    virtual bool Dispatch();
-
-    virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
@@ -63,8 +57,6 @@ public:
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
-    bool            m_initialized;
-
     gint            m_idleTag;
 #if wxUSE_THREADS
     gint            m_wakeUpTimerTag;

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index ad1496c96770b1d3bc1e7282f4a5c219c52f66bc..834aaa338e37e162b1e836fa556cc80939d028e1 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -41,13 +41,7 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
     virtual bool Initialized();
-    virtual bool Pending();
-    virtual bool Dispatch();
-
-    virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
@@ -63,8 +57,6 @@ public:
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
-    bool            m_initialized;
-
     gint            m_idleTag;
 #if wxUSE_THREADS
     gint            m_wakeUpTimerTag;

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index e65ee6ec2f937f2d86b591bb0155cc846c0d3d43..94e28ec345f9854435d425e66a29b41662e0d55a 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -49,7 +49,6 @@ class WXDLLEXPORT wxApp: public wxAppBase
 
     virtual int MainLoop();
     virtual void ExitMainLoop();
-    virtual bool Initialized();
     virtual bool Pending() ;
     virtual bool Dispatch() ;
 

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 5cd952e867947290648d94c89686e8b72ef08678..d0bedefdf4776b93d88be5328edc6b83aecbd6f5 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -42,8 +42,6 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
-    virtual bool Initialized();
-
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 893423b3c08a48b6393a42ad014cd3b58e452828..c33deb99dfa10514ca11575f01071c32719885f1 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -51,8 +51,6 @@ public:
     // -----------------------------------
     
     virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
 
     virtual void Exit();
 

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 835fdf8afd37596cd58699acd38ec2d80cbc87e4..058849b80f43bce1b40ccbb8a7c18c9d9cf7bb34 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -39,8 +39,6 @@ public:
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 
-    virtual bool Initialized();
-
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 8095ec921c2dba9ffaff98c2f6e41cbcf9565fc2..37fcdf23d63e0c800a23e12b7ff66874126090cc 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -72,7 +72,6 @@ public:
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp(void);
 
-    virtual bool Initialized(void);
     virtual bool OnInitGui(void);
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 034385a84a47c21949e070ad672e1b48c6df49e5..332a8ee06b822aef6bc21727d5344bd9ae8c6444 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -49,8 +49,6 @@ public:
     // override base class (pure) virtuals
     // -----------------------------------
 
-    virtual bool Initialized();
-
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 1436da767d686b9b5abad0994ef9bd7c89eaad90..c4fe8f3181f6feb97d94dcca160b520d03421842 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -230,14 +230,6 @@ bool wxApp::OnInit()
     return TRUE;
 }
 
-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
-}
-
 void wxApp::Exit()
 {
     wxApp::CleanUp();

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index d3d562d3e6324f41f1e23838a453e4dbbc1eabe6..778f5a2a7fb6afe3839f3593e8ca8646e0f97411 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -270,7 +270,7 @@ void wxAppBase::ExitMainLoop()
 #if wxUSE_EVTLOOP_IN_APP
     // we should exit from the main event loop, not just any currently active
     // (e.g. modal dialog) event loop
-    if ( m_mainLoop )
+    if ( m_mainLoop && m_mainLoop->IsRunning() )
     {
         m_mainLoop->Exit(0);
     }

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 21748cb2e9b8dee43e95fe1adeaf2f3fd0425641..53aa238e66165046506fec4f015e4c5adcb8f348 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -399,7 +399,6 @@ END_EVENT_TABLE()
 
 wxApp::wxApp()
 {
-    m_initialized = FALSE;
 #ifdef __WXDEBUG__
     m_isInAssert = FALSE;
 #endif // __WXDEBUG__
@@ -538,42 +537,6 @@ GdkVisual *wxApp::GetGdkVisual()
     return visual;
 }
 
-int wxApp::MainLoop()
-{
-    gtk_main();
-    return 0;
-}
-
-void wxApp::Exit()
-{
-    // VZ: no idea why is it different from ExitMainLoop() but this is what
-    //     wxExit() used to do
-    gtk_main_quit();
-}
-
-void wxApp::ExitMainLoop()
-{
-    if (gtk_main_level() > 0)
-        gtk_main_quit();
-}
-
-bool wxApp::Initialized()
-{
-    return m_initialized;
-}
-
-bool wxApp::Pending()
-{
-    return (gtk_events_pending() > 0);
-}
-
-bool wxApp::Dispatch()
-{
-    gtk_main_iteration();
-
-    return true;
-}
-
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
 #if wxUSE_THREADS

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 21748cb2e9b8dee43e95fe1adeaf2f3fd0425641..53aa238e66165046506fec4f015e4c5adcb8f348 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -399,7 +399,6 @@ END_EVENT_TABLE()
 
 wxApp::wxApp()
 {
-    m_initialized = FALSE;
 #ifdef __WXDEBUG__
     m_isInAssert = FALSE;
 #endif // __WXDEBUG__
@@ -538,42 +537,6 @@ GdkVisual *wxApp::GetGdkVisual()
     return visual;
 }
 
-int wxApp::MainLoop()
-{
-    gtk_main();
-    return 0;
-}
-
-void wxApp::Exit()
-{
-    // VZ: no idea why is it different from ExitMainLoop() but this is what
-    //     wxExit() used to do
-    gtk_main_quit();
-}
-
-void wxApp::ExitMainLoop()
-{
-    if (gtk_main_level() > 0)
-        gtk_main_quit();
-}
-
-bool wxApp::Initialized()
-{
-    return m_initialized;
-}
-
-bool wxApp::Pending()
-{
-    return (gtk_events_pending() > 0);
-}
-
-bool wxApp::Dispatch()
-{
-    gtk_main_iteration();
-
-    return true;
-}
-
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
 #if wxUSE_THREADS

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index f863e938af6c5d279b12ae3248c959c9db283fde..a8ca3cdb669a24720efbe41514235b953acb7a9d 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1010,14 +1010,6 @@ wxApp::wxApp()
 #endif
 }
 
-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
-}
-
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index f863e938af6c5d279b12ae3248c959c9db283fde..a8ca3cdb669a24720efbe41514235b953acb7a9d 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1010,14 +1010,6 @@ wxApp::wxApp()
 #endif
 }
 
-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
-}
-
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 327356b8e7eb60b01cd087ee3c2d6c50ea318e9d..d444527ccfa83a0cf5b1d8dae89a9ec800a77161 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -272,11 +272,6 @@ bool wxApp::OnInitGui()
     return TRUE;
 }
 
-bool wxApp::Initialized()
-{
-    return wxTopLevelWindows.GetCount() != 0;
-}
-
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
 #ifdef __DJGPP__

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 9c202c14b17f097bd7c6330c1cae5c6d8806efd0..41e76ef23ce2a5ebe5a89caf895ad5f7632c127e 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -144,14 +144,6 @@ wxApp::~wxApp()
     wxApp::SetInstance(NULL);
 }
 
-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
-
 int wxApp::MainLoop()
 {
     /*
@@ -170,12 +162,6 @@ int wxApp::MainLoop()
     return 0;
 }
 
-void wxApp::ExitMainLoop()
-{
-    if( m_eventLoop->IsRunning() )
-        m_eventLoop->Exit();
-}
-
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 void wxApp::HandlePropertyChange(WXEvent *event)

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index a652ec54b77bcf13492d6cb0c7d939c480da91bd..d689dfa1e66841f2709e593e6df81e7095aca7bf 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -549,18 +549,6 @@ wxApp::~wxApp()
     delete [] argv;
 }
 
-bool wxApp::Initialized()
-{
-#ifndef _WINDLL
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-#else // Assume initialized if DLL (no way of telling)
-    return TRUE;
-#endif
-}
-
 void wxApp::OnIdle(wxIdleEvent& event)
 {
     wxAppBase::OnIdle(event);

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index cfcccb9c6b1356dca1cc69c98c5eb25d028fb0b2..40453eb43e62ed3de05ea25ad8ea93a97043b8dd 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -497,14 +497,6 @@ wxApp::~wxApp()
 #endif
 } // end of wxApp::~wxApp
 
-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-} // end of wxApp::Initialized
-
 bool                                gbInOnIdle = FALSE;
 
 void wxApp::OnIdle(

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 5b3c178b7b7338d82d689470f5e16cd35a54a336..7cce82931ae1db9341649957952c9d22a37671b4 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -243,14 +243,6 @@ wxApp::~wxApp()
 #endif
 }
 
-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
-
 #if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression