Make wxABI_VERSION default be e.g. 20699

[wxWidgets.git] / include / wx / app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index 4eae440186f8fee3691237cba975e648c8ababd7..02c5aee54d3bfee1fada5b7cb6a710af94adaf63 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -206,12 +206,12 @@ public:
         // user-defined class (default implementation creates a wxLogGui
         // object) -- this log object is used by default by all wxLogXXX()
         // functions.
-    virtual wxLog *CreateLogTarget();
+    wxDEPRECATED( virtual wxLog *CreateLogTarget() );
 #endif // wxUSE_LOG
 
         // similar to CreateLogTarget() but for the global wxMessageOutput
         // object
-    virtual wxMessageOutput *CreateMessageOutput();
+    wxDEPRECATED( virtual wxMessageOutput *CreateMessageOutput() );
 
 #endif // WXWIN_COMPATIBILITY_2_4
 
@@ -251,6 +251,10 @@ public:
     // make sure that idle events are sent again
     virtual void WakeUpIdle() { }
 
+    // this is just a convenience: by providing its implementation here we
+    // avoid #ifdefs in the code using it
+    static bool IsMainLoopRunning() { return false; }
+
 
     // debugging support
     // -----------------
@@ -259,7 +263,7 @@ public:
     // version does the normal processing (i.e. shows the usual assert failure
     // dialog box)
     //
-    // the arguments are the place where the assert occured, the text of the
+    // the arguments are the place where the assert occurred, the text of the
     // assert itself and the user-specified message
 #ifdef __WXDEBUG__
     virtual void OnAssert(const wxChar *file,
@@ -274,10 +278,7 @@ public:
     static bool CheckBuildOptions(const char *optionsSignature,
                                   const char *componentName);
 #if WXWIN_COMPATIBILITY_2_4
-    static bool CheckBuildOptions(const wxBuildOptions& buildOptions)
-    {
-        return CheckBuildOptions(buildOptions.m_signature, "your program");
-    }
+    wxDEPRECATED( static bool CheckBuildOptions(const wxBuildOptions& buildOptions) );
 #endif
 
     // implementation only from now on
@@ -378,10 +379,11 @@ public:
 
         // return true if we're running main loop, i.e. if the events can
         // (already) be dispatched
-    bool IsMainLoopRunning() const
+    static bool IsMainLoopRunning()
     {
 #if wxUSE_EVTLOOP_IN_APP
-        return m_mainLoop != NULL;
+        wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
+        return app && app->m_mainLoop != NULL;
 #else
         return false;
 #endif
@@ -556,7 +558,9 @@ protected:
 // ----------------------------------------------------------------------------
 
 #if wxUSE_GUI
-    #if defined(__WXMSW__)
+    #if defined(__WXPALMOS__)
+        #include "wx/palmos/app.h"
+    #elif defined(__WXMSW__)
         #include "wx/msw/app.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/app.h"