PyCrust updates

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index a57f54c7544f3925e78c39a51c3feec67b82d1d3..bd11cae2492311a50135478f6c0c50f36b51b001 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -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);
     }
 


@@ -55,8 +57,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 GetStringSelection() const;

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


@@ -135,8 +137,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


@@ -165,6 +167,9 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
 protected:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
 protected:

+    // 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)
     //


@@ -172,13 +177,24 @@ protected:
     // false if we hit the limit set by SetMaxLength() and so didn't change it
     bool AdjustSpaceLimit();
 
     // false if we hit the limit set by SetMaxLength() and so didn't change it
     bool AdjustSpaceLimit();
 

+#if wxUSE_RICHEDIT
+    // replace the selection with the given text in the specified encoding
+    bool StreamIn(const wxString& value, wxFontEncoding encoding);
+#endif // wxUSE_RICHEDIT
+
+    // set the selection possibly without scrolling the caret into view
+    void DoSetSelection(long from, long to, bool scrollCaret = TRUE);
+

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

-    bool m_isRich; // Are we using rich text edit to implement this?
-#endif
+    // 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()
 
 private:
     DECLARE_EVENT_TABLE()