mingw compilation fix

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 2f1cf96ad2ddb483525d3c1457093d671de3ed25..dad32116b98f0e15d81a9d3902f18d28438fb23e 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -16,8 +16,6 @@
 #pragma interface "app.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
 #include "wx/event.h"
 #include "wx/icon.h"
 
@@ -27,14 +25,6 @@ class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-
-// Force an exit from main loop
-void WXDLLEXPORT wxExit();
-
-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield();
-
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase
@@ -49,8 +39,8 @@ public:
     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
-    virtual bool Pending() ;
-    virtual void Dispatch() ;
+    virtual bool Pending();
+    virtual void Dispatch();
 
     virtual wxIcon GetStdIcon(int which) const;
 
@@ -74,9 +64,9 @@ public:
     bool GetAuto3D() const { return m_auto3D; }
 
 protected:
-    bool              m_showOnInit;
-    int               m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-    bool              m_auto3D ;   // Always use 3D controls, except where overriden
+    bool   m_showOnInit;
+    int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    bool   m_auto3D ;   // Always use 3D controls, except where overriden
 
     /* Windows-specific wxApp definitions */
 
@@ -87,29 +77,51 @@ public:
     static void CleanUp();
 
     static bool RegisterWindowClasses();
+    static bool UnregisterWindowClasses();
+
     // Convert Windows to argc, argv style
     void ConvertToStandardCommandArgs(char* p);
+
+    // message processing
+    // ------------------
+
+    // process the given message
+    virtual void DoMessage(WXMSG *pMsg);
+
+    // retrieve the next message from the queue and process it
     virtual bool DoMessage();
+
+    // preprocess the message
     virtual bool ProcessMessage(WXMSG* pMsg);
+
+    // idle processing
+    // ---------------
+
     void DeletePendingObjects();
     bool ProcessIdle();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
-    int GetComCtl32Version() const;
+
+#if wxUSE_RICHEDIT
+    // initialize the richedit DLL of (at least) given version, return TRUE if
+    // ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3)
+    static bool InitRichEdit(int version = 2);
+#endif // wxUSE_RICHEDIT
+
+    // returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it
+    // wasn't found at all
+    static int GetComCtl32Version();
 
 public:
     int               m_nCmdShow;
 
 protected:
-    bool              m_keepGoing ;
+    bool              m_keepGoing;
 
     DECLARE_EVENT_TABLE()
 };
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
-int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, char *lpszCmdLine,
-                    int nCmdShow, bool enterLoop = TRUE);
+int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance,
+                        char *lpszCmdLine, int nCmdShow, bool enterLoop = TRUE);
 #else
 int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif