superposition of text styles in wxTextCtrl now works as expected (and as documented)

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index dad32116b98f0e15d81a9d3902f18d28438fb23e..c6e1348015ff006f8b9d87f0a8306ba66f122892 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -41,6 +41,7 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();

+    virtual bool Yield(bool onlyIfNeeded = FALSE);

 
     virtual wxIcon GetStdIcon(int which) const;
 
 
     virtual wxIcon GetStdIcon(int which) const;
 


@@ -80,7 +81,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
     // ------------------