fix wxBase apps compilation after ProcessIdle() change from the patch 588734

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 29813a1978698e3beaae21a2e92f813d28eeb890..25ea4f6729c0e75e318062536c92fac951876322 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -146,8 +146,6 @@ public:
         // Override: rarely.
     virtual void OnFatalException() { }
 
         // Override: rarely.
     virtual void OnFatalException() { }
 

-    virtual bool ProcessIdle() = 0;
-

     // the worker functions - usually not used directly by the user code
     // -----------------------------------------------------------------
 
     // the worker functions - usually not used directly by the user code
     // -----------------------------------------------------------------
 


@@ -179,6 +177,13 @@ public:
         //          may result in calling the same event handler again), use
         //          with _extreme_ care or, better, don't use at all!
     virtual bool Yield(bool onlyIfNeeded = FALSE) = 0;
         //          may result in calling the same event handler again), use
         //          with _extreme_ care or, better, don't use at all!
     virtual bool Yield(bool onlyIfNeeded = FALSE) = 0;

+
+        // this virtual function is called in the GUI mode when the application
+        // becomes idle and normally just sends wxIdleEvent to all interested
+        // parties
+        //
+        // it should return TRUE if more idle events are needed, FALSE if not
+    virtual bool ProcessIdle() = 0;

 #endif // wxUSE_GUI
 
     // application info: name, description, vendor
 #endif // wxUSE_GUI
 
     // application info: name, description, vendor

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 09ae97826c115d9ed00350c9cd4955228adb7e10..2e4b571d1fec2b86141e9674f7f6b51c43f98f79 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -49,7 +49,6 @@ class /* no WXDLLEXPORT */ wxConsoleApp : public wxApp
 {
 public:
     virtual int OnRun() { wxFAIL_MSG(wxT("unreachable")); return 0; }
 {
 public:
     virtual int OnRun() { wxFAIL_MSG(wxT("unreachable")); return 0; }

-    virtual bool ProcessIdle() { return TRUE; }

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------