From: Vadim Zeitlin Date: Sat, 27 Sep 2003 13:47:46 +0000 (+0000) Subject: removed wxApp::Initialized() (replaced with a dummy version in wxApp itself); wxApp... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dd435a79ed2c79e20621fbe6b1013a86a9e05fed removed wxApp::Initialized() (replaced with a dummy version in wxApp itself); wxApp in wxGTK now uses wxEvtLoop too 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 1137aa6ccd..82d7d17f37 100644 --- 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 7c2b61c4e3..f172a41422 100644 --- 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 d114405049..3dfca73c96 100644 --- 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 ad1496c967..834aaa338e 100644 --- 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 ad1496c967..834aaa338e 100644 --- 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 e65ee6ec2f..94e28ec345 100644 --- 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 5cd952e867..d0bedefdf4 100644 --- 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 893423b3c0..c33deb99df 100644 --- 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 835fdf8afd..058849b80f 100644 --- 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 8095ec921c..37fcdf23d6 100644 --- 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 034385a84a..332a8ee06b 100644 --- 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 1436da767d..c4fe8f3181 100644 --- 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 d3d562d3e6..778f5a2a7f 100644 --- 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 21748cb2e9..53aa238e66 100644 --- 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 21748cb2e9..53aa238e66 100644 --- 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 f863e938af..a8ca3cdb66 100644 --- 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 f863e938af..a8ca3cdb66 100644 --- 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 327356b8e7..d444527ccf 100644 --- 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 9c202c14b1..41e76ef23c 100644 --- 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 a652ec54b7..d689dfa1e6 100644 --- 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 cfcccb9c6b..40453eb43e 100644 --- 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 5b3c178b7b..7cce82931a 100644 --- 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