From 3373e9007022756260a650579fe6448dc4bdca3d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Mar 2009 13:58:42 +0000
Subject: [PATCH] wxUniv compilation fixes after wxTextEntry::DoGetValue()
 change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/univ/combobox.h | 4 +++-
 include/wx/univ/textctrl.h | 3 +--
 src/univ/combobox.cpp      | 2 +-
 src/univ/textctrl.cpp      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 30a46691f6..a8ccdf0564 100644
--- 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 127c3f7c34..761ab3b805 100644
--- 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 4b4953f462..9d8033a7d8 100644
--- 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 9417dc7633..bc625f70a7 100644
--- 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
-- 
2.45.2