some compilation fixes atttempts for solaris

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 77e62a20a99815e75ce49701e0e13e63826929ca..7deb0a45a78bd97f61d03cb40327dd58f883778d 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -31,6 +31,18 @@
     typedef wxObject* (*wxAppInitializerFunction)();
 #endif
 
+// ----------------------------------------------------------------------------
+// headers we have to include here
+// ----------------------------------------------------------------------------
+
+#include "wx/event.h"       // for the base class
+
+#include "wx/window.h"      // for wxTopLevelWindows
+
+#if wxUSE_LOG
+    #include "wx/log.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -197,8 +209,8 @@ public:
         { return m_appInitFn; }
 
     // access to the command line arguments
-    int     argc;
-    char  **argv;
+    int      argc;
+    wxChar **argv;
 
 //private:
 protected:
@@ -234,10 +246,32 @@ protected:
     #include "wx/gtk/app.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/app.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/app.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/app.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// the global data
+// ----------------------------------------------------------------------------
+
+// the one and only application object - use of wxTheApp in application code
+// is discouraged, consider using DECLARE_APP() after which you may call
+// wxGetApp() which will return the object of the correct type (i.e. MyApp and
+// not wxApp)
+WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+// Force an exit from main loop
+void WXDLLEXPORT wxExit();
+
+// Yield to other apps/messages
+bool WXDLLEXPORT wxYield();
+
 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object
 // ----------------------------------------------------------------------------