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

wxUniv compilation fixes after wxTextEntry::DoGetValue() change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-02 13:58:42 +00:00
parent 0208a9a31b
commit 3373e90070
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/univ/combobox.h
View File

@@ -91,7 +91,7 @@ public:
// implement the combobox interface // implement the combobox interface
// wxTextCtrl methods // wxTextCtrl methods
virtual wxString GetValue() const; virtual wxString GetValue() const { return DoGetValue(); }
virtual void SetValue(const wxString& value); virtual void SetValue(const wxString& value);
virtual void WriteText(const wxString& value); virtual void WriteText(const wxString& value);
virtual void Copy(); virtual void Copy();
@@ -151,6 +151,8 @@ public:
virtual void SetClientDataType(wxClientDataType clientDataItemsType); virtual void SetClientDataType(wxClientDataType clientDataItemsType);
protected: protected:
virtual wxString DoGetValue() const;
virtual int DoInsertItems(const wxArrayStringsAdapter& items, virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos, unsigned int pos,
void **clientData, wxClientDataType type); void **clientData, wxClientDataType type);

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

@@ -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 int GetLineLength(wxTextCoord lineNo) const;
virtual wxString GetLineText(wxTextCoord lineNo) const; virtual wxString GetLineText(wxTextCoord lineNo) const;
virtual int GetNumberOfLines() const; virtual int GetNumberOfLines() const;
@@ -260,6 +258,7 @@ protected:
// implements Set/ChangeValue() // implements Set/ChangeValue()
virtual void DoSetValue(const wxString& value, int flags = 0); virtual void DoSetValue(const wxString& value, int flags = 0);
virtual wxString DoGetValue() const;
// common part of all ctors // common part of all ctors
void Init(); void Init();

2
src/univ/combobox.cpp
View File

@@ -273,7 +273,7 @@ wxComboBox::~wxComboBox()
// wxComboBox methods forwarded to wxTextCtrl // wxComboBox methods forwarded to wxTextCtrl
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxString wxComboBox::GetValue() const wxString wxComboBox::DoGetValue() const
{ {
return wxComboCtrl::GetValue(); return wxComboCtrl::GetValue();
} }

2
src/univ/textctrl.cpp
View File

@@ -819,7 +819,7 @@ size_t wxTextCtrl::GetLineCount() const
return MData().m_lines.GetCount(); 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 // 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 // recompute it when asked - and to invalidate it we just empty it in