reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index dad32116b98f0e15d81a9d3902f18d28438fb23e..852a5b50e7fedc71f0bdd74383e4065b25d1847e 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -41,8 +41,7 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
-
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
     virtual int GetPrintMode() const { return m_printMode; }
@@ -80,7 +79,7 @@ public:
     static bool UnregisterWindowClasses();
 
     // Convert Windows to argc, argv style
-    void ConvertToStandardCommandArgs(char* p);
+    void ConvertToStandardCommandArgs(const char* p);
 
     // message processing
     // ------------------