reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index bd11cae2492311a50135478f6c0c50f36b51b001..66114fa0c77d286fed2ef14b9d9e7e31b818f17a 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -50,6 +50,8 @@ public:
     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;
@@ -58,7 +60,6 @@ public:
     virtual bool IsEditable() const;
 
     virtual void GetSelection(long* from, long* to) const;
-    virtual wxString GetStringSelection() const;
 
     // operations
     // ----------
@@ -123,6 +124,8 @@ public:
     // Implementation from now on
     // --------------------------
 
+    virtual void SetWindowStyleFlag(long style);
+
     virtual void Command(wxCommandEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
@@ -170,6 +173,9 @@ protected:
     // common part of all ctors
     void Init();
 
+    // intercept WM_GETDLGCODE
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     //
@@ -178,17 +184,30 @@ protected:
     bool AdjustSpaceLimit();
 
 #if wxUSE_RICHEDIT
-    // replace the selection with the given text in the specified encoding
-    bool StreamIn(const wxString& value, wxFontEncoding encoding);
+    // 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;
 
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) 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