Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 38878cf44d24a368c03f28cab79cb65e2f4bb053..02e57755fa14e550c2f3f5b9dffdc345e2cd0b57 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -34,13 +34,7 @@ class WXDLLIMPEXP_BASE wxCmdLineParser;
 class WXDLLIMPEXP_BASE wxLog;
 class WXDLLIMPEXP_BASE wxMessageOutput;
 
 class WXDLLIMPEXP_BASE wxLog;
 class WXDLLIMPEXP_BASE wxMessageOutput;
 

-// wxUSE_EVTLOOP_IN_APP is a temporary hack needed until all ports are updated
-// to use wxEventLoop, otherwise we get linking errors on wxMac, it's going to
-// disappear a.s.a.p.
-#ifdef __WXMAC__
-    #define wxUSE_EVTLOOP_IN_APP 0
-#else
-    #define wxUSE_EVTLOOP_IN_APP 1
+#if wxUSE_GUI

     class WXDLLEXPORT wxEventLoop;
 #endif
 
     class WXDLLEXPORT wxEventLoop;
 #endif
 


@@ -251,13 +245,22 @@ public:
     // debugging support
     // -----------------
 
     // debugging support
     // -----------------
 

+#ifdef __WXDEBUG__

     // this function is called when an assert failure occurs, the base class
     // version does the normal processing (i.e. shows the usual assert failure
     // dialog box)
     //
     // this function is called when an assert failure occurs, the base class
     // version does the normal processing (i.e. shows the usual assert failure
     // dialog box)
     //

-    // the arguments are the place where the assert occurred, the text of the
+    // the arguments are the location of the failed assert (func may be empty
+    // if the compiler doesn't support C99 __FUNCTION__), the text of the

     // assert itself and the user-specified message
     // assert itself and the user-specified message

-#ifdef __WXDEBUG__
+    virtual void OnAssertFailure(const wxChar *file,
+                                 int line,
+                                 const wxChar *func,
+                                 const wxChar *cond,
+                                 const wxChar *msg);
+
+    // old version of the function without func parameter, for compatibility
+    // only, override OnAssertFailure() in the new code

     virtual void OnAssert(const wxChar *file,
                           int line,
                           const wxChar *cond,
     virtual void OnAssert(const wxChar *file,
                           int line,
                           const wxChar *cond,


@@ -373,12 +376,8 @@ public:
         // (already) be dispatched
     static bool IsMainLoopRunning()
     {
         // (already) be dispatched
     static bool IsMainLoopRunning()
     {

-#if wxUSE_EVTLOOP_IN_APP

         wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
         return app && app->m_mainLoop != NULL;
         wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
         return app && app->m_mainLoop != NULL;

-#else
-        return false;
-#endif

     }
 
         // execute the main GUI loop, the function returns when the loop ends
     }
 
         // execute the main GUI loop, the function returns when the loop ends


@@ -521,11 +520,9 @@ protected:
     virtual wxAppTraits *CreateTraits();
 
 
     virtual wxAppTraits *CreateTraits();
 
 

-#if wxUSE_EVTLOOP_IN_APP

     // the main event loop of the application (may be NULL if the loop hasn't
     // been started yet or has already terminated)
     wxEventLoop *m_mainLoop;
     // the main event loop of the application (may be NULL if the loop hasn't
     // been started yet or has already terminated)
     wxEventLoop *m_mainLoop;

-#endif // wxUSE_EVTLOOP_IN_APP

 
     // the main top level window (may be NULL)
     wxWindow *m_topWindow;
 
     // the main top level window (may be NULL)
     wxWindow *m_topWindow;


@@ -567,8 +564,10 @@ protected:
         #include "wx/motif/app.h"
     #elif defined(__WXMGL__)
         #include "wx/mgl/app.h"
         #include "wx/motif/app.h"
     #elif defined(__WXMGL__)
         #include "wx/mgl/app.h"

-    #elif defined(__WXGTK__)
+    #elif defined(__WXGTK20__)

         #include "wx/gtk/app.h"
         #include "wx/gtk/app.h"

+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/app.h"

     #elif defined(__WXX11__)
         #include "wx/x11/app.h"
     #elif defined(__WXMAC__)
     #elif defined(__WXX11__)
         #include "wx/x11/app.h"
     #elif defined(__WXMAC__)