Applied patch [ 597398 ] Generic MDI, wxNotebook based.

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index e361fa3ca8d6c2f627747ec35e908b0dd51294a6..c85dcc4b834f7a2a252ea242093aa32c8a5536ec 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -42,8 +42,7 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);

-
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool ProcessIdle();

 
     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; }


@@ -81,7 +80,7 @@ public:
     static bool UnregisterWindowClasses();
 
     // Convert Windows to argc, argv style
     static bool UnregisterWindowClasses();
 
     // Convert Windows to argc, argv style

-    void ConvertToStandardCommandArgs(char* p);
+    void ConvertToStandardCommandArgs(const char* p);

 
     // message processing
     // ------------------
 
     // message processing
     // ------------------


@@ -99,7 +98,6 @@ public:
     // ---------------
 
     void DeletePendingObjects();
     // ---------------
 
     void DeletePendingObjects();

-    bool ProcessIdle();

 
 #if wxUSE_RICHEDIT
     // initialize the richedit DLL of (at least) given version, return TRUE if
 
 #if wxUSE_RICHEDIT
     // initialize the richedit DLL of (at least) given version, return TRUE if