wxUniv compilation fixes after wxTextEntry::DoGetValue() change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 30a46691f686a4507be97b56cdacb1f648657aa6..a8ccdf05649fb3cf08d6e9764d03f0f873dbcba5 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -91,7 +91,7 @@ public:
     // implement the combobox interface
 
     // wxTextCtrl methods
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const { return DoGetValue(); }
     virtual void SetValue(const wxString& value);
     virtual void WriteText(const wxString& value);
     virtual void Copy();
@@ -151,6 +151,8 @@ public:
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 protected:
+    virtual wxString DoGetValue() const;
+
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 127c3f7c34dad43b05a1c09d2ca0d8a171cb7229..761ab3b805c1c2703c9b33079421f33072be00f9 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -104,8 +104,6 @@ public:
     // 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;
@@ -260,6 +258,7 @@ protected:
 
     // implements Set/ChangeValue()
     virtual void DoSetValue(const wxString& value, int flags = 0);
+    virtual wxString DoGetValue() const;
 
     // common part of all ctors
     void Init();

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 4b4953f462a6551ce6b10fd0592f1bffc7821b34..9d8033a7d865445c9a4c5a9f3fc56876a4771d35 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -273,7 +273,7 @@ wxComboBox::~wxComboBox()
 // wxComboBox methods forwarded to wxTextCtrl
 // ----------------------------------------------------------------------------
 
-wxString wxComboBox::GetValue() const
+wxString wxComboBox::DoGetValue() const
 {
     return wxComboCtrl::GetValue();
 }

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 9417dc76334ffd50d74d0d490cda9ca733d1a481..bc625f70a7bbcb5dd31964a2104776a0503ba5c7 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -819,7 +819,7 @@ size_t wxTextCtrl::GetLineCount() const
     return MData().m_lines.GetCount();
 }
 
-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const
 {
     // for multiline controls we don't always store the total value but only
     // recompute it when asked - and to invalidate it we just empty it in