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 79431e92beecbcb87be94a8d477a8a3501d605ee..c6e1348015ff006f8b9d87f0a8306ba66f122892 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -39,8 +39,9 @@ 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 bool Yield(bool onlyIfNeeded = FALSE);

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


@@ -64,9 +65,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,9 +78,10 @@ public:
     static void CleanUp();
 
     static bool RegisterWindowClasses();
     static void CleanUp();
 
     static bool RegisterWindowClasses();

+    static bool UnregisterWindowClasses();

 
     // Convert Windows to argc, argv style
 
     // Convert Windows to argc, argv style

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

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


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

-    bool              m_keepGoing ;
+    bool              m_keepGoing;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };