fix multiple problems with selection in controls with wxTR_MULTIPLE style (closes...

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

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 941a60c21dc50f1d650bfaf4088545f7704753b1..761ab3b805c1c2703c9b33079421f33072be00f9 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -66,7 +66,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrlCommandProcessor;
 // wxTextCtrl
 // ----------------------------------------------------------------------------
 
 // wxTextCtrl
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase,
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase,

                                public wxScrollHelper
 {
 public:
                                public wxScrollHelper
 {
 public:


@@ -104,8 +104,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

-    virtual wxString GetValue() const;
-

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


@@ -260,6 +258,7 @@ protected:
 
     // implements Set/ChangeValue()
     virtual void DoSetValue(const wxString& value, int flags = 0);
 
     // implements Set/ChangeValue()
     virtual void DoSetValue(const wxString& value, int flags = 0);

+    virtual wxString DoGetValue() const;

 
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();