added assert to check that notebook page does have notebook as parent; removed duplic...

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 90a612d06c520003c5f75534a75f5478645b1121..c85dcc4b834f7a2a252ea242093aa32c8a5536ec 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -39,10 +39,10 @@ public:
     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
-    virtual bool Pending() ;
-    virtual void Dispatch() ;
-
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool Pending();
+    virtual void Dispatch();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
@@ -64,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 */
 
@@ -77,12 +77,27 @@ public:
     static void CleanUp();
 
     static bool RegisterWindowClasses();
+    static bool UnregisterWindowClasses();
+
     // Convert Windows to argc, argv style
-    void ConvertToStandardCommandArgs(char* p);
+    void ConvertToStandardCommandArgs(const 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_RICHEDIT
     // initialize the richedit DLL of (at least) given version, return TRUE if
@@ -98,7 +113,7 @@ public:
     int               m_nCmdShow;
 
 protected:
-    bool              m_keepGoing ;
+    bool              m_keepGoing;
 
     DECLARE_EVENT_TABLE()
 };