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
This commit is contained in:
@@ -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
|
||||
|
@@ -48,7 +48,6 @@ public:
|
||||
// Implement wxAppBase pure virtuals
|
||||
virtual int MainLoop();
|
||||
virtual void ExitMainLoop();
|
||||
virtual bool Initialized();
|
||||
virtual bool Pending();
|
||||
virtual bool Dispatch();
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -49,7 +49,6 @@ class WXDLLEXPORT wxApp: public wxAppBase
|
||||
|
||||
virtual int MainLoop();
|
||||
virtual void ExitMainLoop();
|
||||
virtual bool Initialized();
|
||||
virtual bool Pending() ;
|
||||
virtual bool Dispatch() ;
|
||||
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -51,8 +51,6 @@ public:
|
||||
// -----------------------------------
|
||||
|
||||
virtual int MainLoop();
|
||||
virtual void ExitMainLoop();
|
||||
virtual bool Initialized();
|
||||
|
||||
virtual void Exit();
|
||||
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -49,8 +49,6 @@ public:
|
||||
// override base class (pure) virtuals
|
||||
// -----------------------------------
|
||||
|
||||
virtual bool Initialized();
|
||||
|
||||
virtual void Exit();
|
||||
|
||||
virtual bool Yield(bool onlyIfNeeded = FALSE);
|
||||
|
Reference in New Issue
Block a user