A little fix for Vadim's fix

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index b516b8c8a33c8a589afbf345d3a33c977a0655c5..3e0174e66efb7fbeb8369c0225dc959be1031b16 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/msw/textctrl.h

 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:


@@ -55,8 +55,8 @@ public:
     virtual bool IsModified() const;
     virtual bool IsEditable() const;
 
     virtual bool IsModified() const;
     virtual bool IsEditable() const;
 

-    // If the return values from and to are the same, there is no selection.

     virtual void GetSelection(long* from, long* to) const;
     virtual void GetSelection(long* from, long* to) const;

+    virtual wxString GetSelection() const;

 
     // operations
     // ----------
 
     // operations
     // ----------


@@ -72,6 +72,8 @@ public:
     // clears the dirty flag
     virtual void DiscardEdits();
 
     // clears the dirty flag
     virtual void DiscardEdits();
 

+    virtual void SetMaxLength(unsigned long len);
+

     // writing text inserts it at the current position, appending always
     // inserts it at the end
     virtual void WriteText(const wxString& text);
     // writing text inserts it at the current position, appending always
     // inserts it at the end
     virtual void WriteText(const wxString& text);


@@ -143,7 +145,6 @@ public:
 #endif // wxUSE_RICHEDIT
 
     virtual void AdoptAttributesFromHWND();
 #endif // wxUSE_RICHEDIT
 
     virtual void AdoptAttributesFromHWND();

-    virtual void SetupColours();

 
     virtual bool AcceptsFocus() const;
 
 
     virtual bool AcceptsFocus() const;
 


@@ -164,16 +165,21 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
 protected:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
 protected:

-#if wxUSE_RICHEDIT
-    bool      m_isRich; // Are we using rich text edit to implement this?
-#endif
-

     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)

-    void AdjustSpaceLimit();
+    //
+    // returns true if we increased the limit to allow entering more text,
+    // false if we hit the limit set by SetMaxLength() and so didn't change it
+    bool AdjustSpaceLimit();

 
 

+    // override some base class virtuals
+    virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

+#if wxUSE_RICHEDIT
+    bool m_isRich; // Are we using rich text edit to implement this?
+#endif
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)