added GAUGE standard colour and use it in DrawProgressBar() if the colour

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index b76a6d5fb8f3084d1254183115da3eb8dcab2f49..270a4550e65ef9426d881e61cc1d522e1e084b17 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:


@@ -22,7 +22,7 @@ public:
     // creation
     // --------
 
     // creation
     // --------
 

-    wxTextCtrl();
+    wxTextCtrl() { Init(); }

     wxTextCtrl(wxWindow *parent, wxWindowID id,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
     wxTextCtrl(wxWindow *parent, wxWindowID id,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,


@@ -31,6 +31,8 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)
     {
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)
     {

+        Init();
+

         Create(parent, id, value, pos, size, style, validator, name);
     }
 
         Create(parent, id, value, pos, size, style, validator, name);
     }
 


@@ -48,6 +50,8 @@ public:
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
 
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
 

+    virtual wxString GetRange(long from, long to) const;
+

     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;


@@ -55,7 +59,6 @@ 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;
 
     // operations
     virtual void GetSelection(long* from, long* to) const;
 
     // operations


@@ -72,6 +75,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);


@@ -133,8 +138,8 @@ public:
 #if wxUSE_RICHEDIT
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
 #if wxUSE_RICHEDIT
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 

-    bool IsRich() const { return m_isRich; }
-    void SetRichEdit(bool isRich) { m_isRich = isRich; }
+    int GetRichVersion() const { return m_verRichEdit; }
+    bool IsRich() const { return m_verRichEdit != 0; }

 
     // rich edit controls are not compatible with normal ones and wem ust set
     // the colours for them otherwise
 
     // rich edit controls are not compatible with normal ones and wem ust set
     // the colours for them otherwise


@@ -143,7 +148,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,18 +168,46 @@ 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
+    // common part of all ctors
+    void Init();

 
     // 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();
+
+#if wxUSE_RICHEDIT
+    // replace the selection or the entire control contents with the given text
+    // in the specified encoding
+    bool StreamIn(const wxString& value,
+                  wxFontEncoding encoding,
+                  bool selOnly);
+#endif // wxUSE_RICHEDIT
+
+    // replace the contents of the selection or of the entire control with the
+    // given text
+    void DoWriteText(const wxString& text, bool selectionOnly = TRUE);
+
+    // set the selection possibly without scrolling the caret into view
+    void DoSetSelection(long from, long to, bool scrollCaret = TRUE);
+
+    // get the length of the line containing the character at the given
+    // position
+    long GetLengthOfLineContainingPos(long pos) const;

 
     // override some base class virtuals
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual wxSize DoGetBestSize() const;
 
 
     // override some base class virtuals
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual wxSize DoGetBestSize() const;
 

+#if wxUSE_RICHEDIT
+    // we're using RICHEDIT (and not simple EDIT) control if this field is not
+    // 0, it also gives the version of the RICHEDIT control being used (1, 2 or
+    // 3 so far)
+    int m_verRichEdit;
+#endif // wxUSE_RICHEDIT
+

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