added some trivial macros for exception handling

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

diff --git a/include/wx/app.h b/include/wx/app.h
index edd3eef48865a0ff307693c7e9911a9ec1777490..220c68a12849f2a24127109962d72cefd1ac2ee7 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -32,6 +32,16 @@ class WXDLLIMPEXP_BASE wxCmdLineParser;
 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
+    class WXDLLEXPORT wxEventLoop;
+#endif
+
 // ----------------------------------------------------------------------------
 // typedefs
 // ----------------------------------------------------------------------------
@@ -367,24 +377,27 @@ public:
     // -----------------------------------------------------------------
 
         // execute the main GUI loop, the function returns when the loop ends
-    virtual int MainLoop() = 0;
+    virtual int MainLoop();
 
         // exit the main loop thus terminating the application
     virtual void Exit();
 
         // exit the main GUI loop during the next iteration (i.e. it does not
         // stop the program immediately!)
-    virtual void ExitMainLoop() = 0;
+    virtual void ExitMainLoop();
 
-        // returns TRUE if the program is initialized
+        // 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() = 0;
+    virtual bool Pending();
 
         // process the first event in the event queue (blocks until an event
-        // apperas if there are none currently)
-    virtual void Dispatch() = 0;
+        // appears if there are none currently, use Pending() if this is not
+        // wanted), returns false if the event loop should stop and true
+        // otherwise
+    virtual bool Dispatch();
 
         // process all currently pending events right now
         //
@@ -402,7 +415,7 @@ public:
         // parties
         //
         // it should return TRUE if more idle events are needed, FALSE if not
-    virtual bool ProcessIdle() ;
+    virtual bool ProcessIdle();
 
         // Send idle event to window and all subwindows
         // Returns TRUE if more idle time is requested.
@@ -493,6 +506,12 @@ protected:
     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;
+#endif // wxUSE_EVTLOOP_IN_APP
+
     // the main top level window (may be NULL)
     wxWindow *m_topWindow;