corrected conditional include

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 6eb98de4fafcaeecc72328bdda81d1098e6a93cb..e7341edb9e8643589b49b061ed6dcfd6d06a88f7 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -39,8 +39,8 @@ public:
     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 wxIcon GetStdIcon(int which) const;
 


@@ -64,9 +64,9 @@ public:
     bool GetAuto3D() const { return m_auto3D; }
 
 protected:
     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 */
 
 
     /* Windows-specific wxApp definitions */
 


@@ -77,27 +77,50 @@ public:
     static void CleanUp();
 
     static bool RegisterWindowClasses();
     static void CleanUp();
 
     static bool RegisterWindowClasses();

+

     // Convert Windows to argc, argv style
     void ConvertToStandardCommandArgs(char* p);
     // 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();
     virtual bool DoMessage();

+
+    // preprocess the message

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

+
+    // idle processing
+    // ---------------
+

     void DeletePendingObjects();
     bool ProcessIdle();
     void DeletePendingObjects();
     bool ProcessIdle();

-    void ProcessPendingEvents();
-    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:
 
 public:
     int               m_nCmdShow;
 
 protected:

-    bool              m_keepGoing ;
+    bool              m_keepGoing;

 
     DECLARE_EVENT_TABLE()
 };
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
     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
 #else
 int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif