Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxGTK1 compilation after wxTextEntry DoGetValue() change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-03 09:21:35 +00:00
parent 417943bf06
commit 55410bb4f6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk1/combobox.h
View File

@@ -92,7 +92,7 @@ public:
virtual void SetSelection(int n); virtual void SetSelection(int n);
virtual void SetString(unsigned int n, const wxString &text); virtual void SetString(unsigned int n, const wxString &text);
wxString GetValue() const; wxString GetValue() const { return DoGetValue(); }
void SetValue(const wxString& value); void SetValue(const wxString& value);
void WriteText(const wxString& value); void WriteText(const wxString& value);
@@ -169,7 +169,8 @@ protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
// implement wxTextEntry pure virtual method // implement wxTextEntry pure virtual methods
virtual wxString DoGetValue() const;
virtual wxWindow *GetEditableWindow() { return this; } virtual wxWindow *GetEditableWindow() { return this; }
// Widgets that use the style->base colour for the BG colour should // Widgets that use the style->base colour for the BG colour should

3
include/wx/gtk1/textctrl.h
View File

@@ -42,8 +42,6 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual wxString GetValue() const;
virtual int GetLineLength(long lineNo) const; virtual int GetLineLength(long lineNo) const;
virtual wxString GetLineText(long lineNo) const; virtual wxString GetLineText(long lineNo) const;
virtual int GetNumberOfLines() const; virtual int GetNumberOfLines() const;
@@ -181,6 +179,7 @@ protected:
virtual bool UseGTKStyleBase() const { return true; } virtual bool UseGTKStyleBase() const { return true; }
virtual void DoSetValue(const wxString &value, int flags = 0); virtual void DoSetValue(const wxString &value, int flags = 0);
virtual wxString DoGetValue() const;
private: private:
// change the font for everything in this control // change the font for everything in this control

2
src/gtk1/combobox.cpp
View File

@@ -596,7 +596,7 @@ void wxComboBox::SetSelection( int n )
EnableEvents(); EnableEvents();
} }
wxString wxComboBox::GetValue() const wxString wxComboBox::DoGetValue() const
{ {
GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry ); GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) ); wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );

2
src/gtk1/textctrl.cpp
View File

@@ -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") ); wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );