Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 8a355c415149036d2f2ed19c4954e379871a327b..8324651d6017f190a53491ed532e98b24ee68950 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -108,6 +108,10 @@ public:
         // Override: always in GUI application, rarely in console ones.
     virtual bool OnInit();
 
         // Override: always in GUI application, rarely in console ones.
     virtual bool OnInit();
 

+        // initializes wxMessageOutput; other responsibilities
+        // may be added later
+    virtual void DoInit();
+

 #if wxUSE_GUI
         // a platform-dependent version of OnInit(): the code here is likely to
         // depend on the toolkit. default version does nothing.
 #if wxUSE_GUI
         // a platform-dependent version of OnInit(): the code here is likely to
         // depend on the toolkit. default version does nothing.


@@ -147,6 +151,8 @@ 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
     // -----------------------------------------------------------------
 


@@ -330,8 +336,14 @@ public:
     // 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 occured, the text of the
+    // assert itself and the user-specified message

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    virtual void OnAssert(const wxChar *file,
+                          int line,
+                          const wxChar *cond,
+                          const wxChar *msg);

 #endif // __WXDEBUG__
 
     // check that the wxBuildOptions object (constructed in the application
 #endif // __WXDEBUG__
 
     // check that the wxBuildOptions object (constructed in the application