From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 3 Mar 2009 09:21:35 +0000 (+0000)
Subject: fix wxGTK1 compilation after wxTextEntry DoGetValue() change
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/55410bb4f67febe1ca20654f078ea4fb9a6223ae

fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 079d0f56d0..1d4149e3a8 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -92,7 +92,7 @@ public:
     virtual void SetSelection(int n);
     virtual void SetString(unsigned int n, const wxString &text);
 
-    wxString GetValue() const;
+    wxString GetValue() const { return DoGetValue(); }
     void SetValue(const wxString& value);
     void WriteText(const wxString& value);
 
@@ -169,7 +169,8 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    // implement wxTextEntry pure virtual method
+    // implement wxTextEntry pure virtual methods
+    virtual wxString DoGetValue() const;
     virtual wxWindow *GetEditableWindow() { return this; }
 
     // Widgets that use the style->base colour for the BG colour should
diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 5c7a3ca1bc..c594bc46b2 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -42,8 +42,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual wxString GetValue() const;
-
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
@@ -181,6 +179,7 @@ protected:
     virtual bool UseGTKStyleBase() const { return true; }
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
+    virtual wxString DoGetValue() const;
 
 private:
     // change the font for everything in this control
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index a86bfa6899..ebbbc0c0a4 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -596,7 +596,7 @@ void wxComboBox::SetSelection( int n )
     EnableEvents();
 }
 
-wxString wxComboBox::GetValue() const
+wxString wxComboBox::DoGetValue() const
 {
     GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
     wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index ad7be3702c..547c804242 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -406,7 +406,7 @@ void wxTextCtrl::CalculateScrollbar()
     }
 }
 
-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const
 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );