MinGW compilation fixes.

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 6eb98de4fafcaeecc72328bdda81d1098e6a93cb..768833038d6cd25c42671679d9415e94d0feac54 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -36,13 +36,18 @@ public:
     virtual ~wxApp();
 
     // override base class (pure) virtuals
     virtual ~wxApp();
 
     // override base class (pure) virtuals

+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+

     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
     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;
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
+    virtual void WakeUpIdle();

 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }


@@ -60,48 +65,56 @@ public:
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
 
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
 

-    void SetAuto3D(bool flag) { m_auto3D = flag; }
-    bool GetAuto3D() const { return m_auto3D; }
-

 protected:
 protected:

-    bool              m_showOnInit;
-    int               m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-    bool              m_auto3D ;   // Always use 3D controls, except where overriden
+    int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT

 
     /* Windows-specific wxApp definitions */
 
 public:
 
     // Implementation
 
     /* Windows-specific wxApp definitions */
 
 public:
 
     // Implementation

-    static bool Initialize();
-    static void CleanUp();
-

     static bool RegisterWindowClasses();
     static bool RegisterWindowClasses();

-    // Convert Windows to argc, argv style
-    void ConvertToStandardCommandArgs(char* p);
+    static bool UnregisterWindowClasses();
+
+    // message processing
+    // ------------------
+
+    // process the given message
+    virtual void DoMessage(WXMSG *pMsg);
+
+    // retrieve the next message from the queue and process it

     virtual bool DoMessage();
     virtual bool DoMessage();

+
+    // preprocess the message

     virtual bool ProcessMessage(WXMSG* pMsg);
     virtual bool ProcessMessage(WXMSG* pMsg);

-    void DeletePendingObjects();
-    bool ProcessIdle();
-    void ProcessPendingEvents();
-    int GetComCtl32Version() const;
+
+    // idle processing
+    // ---------------
+
+#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:
 
 public:

-    int               m_nCmdShow;
+    // the SW_XXX value to be used for the frames opened by the application
+    // (currently seems unused which is a bug -- TODO)
+    static int m_nCmdShow;

 
 protected:
 
 protected:

-    bool              m_keepGoing ;
+    // we exit the main event loop when this flag becomes false
+    bool m_keepGoing;

 
     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_EVENT_TABLE()
 };
 

-#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
-int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, char *lpszCmdLine,
-                    int nCmdShow, bool enterLoop = TRUE);
-#else
-int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
-#endif
+int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance,
+                        char *lpszCmdLine, int nCmdShow);

 
 

-#endif
-    // _WX_APP_H_
+#endif // _WX_APP_H_