Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 90a612d06c520003c5f75534a75f5478645b1121..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,10 +77,25 @@ 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();
 


@@ -98,7 +113,7 @@ public:
     int               m_nCmdShow;
 
 protected:
     int               m_nCmdShow;
 
 protected:

-    bool              m_keepGoing ;
+    bool              m_keepGoing;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };