another wxOSX build fix after wxTextEntry::GetValue() renaming to DoGetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -126,7 +126,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
|
|||||||
virtual wxClientDataType GetClientDataType() const;
|
virtual wxClientDataType GetClientDataType() const;
|
||||||
|
|
||||||
// osx specific event handling common for all osx-ports
|
// osx specific event handling common for all osx-ports
|
||||||
|
|
||||||
virtual bool OSXHandleClicked( double timestampsec );
|
virtual bool OSXHandleClicked( double timestampsec );
|
||||||
|
|
||||||
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
|
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
|
||||||
@@ -141,6 +141,10 @@ protected:
|
|||||||
virtual void DoDeleteOneItem(unsigned int n);
|
virtual void DoDeleteOneItem(unsigned int n);
|
||||||
virtual void DoClear();
|
virtual void DoClear();
|
||||||
|
|
||||||
|
// wxTextEntry functions
|
||||||
|
virtual wxString DoGetValue() const;
|
||||||
|
virtual wxWindow *GetEditableWindow() { return this; }
|
||||||
|
|
||||||
// override the base class virtuals involved in geometry calculations
|
// override the base class virtuals involved in geometry calculations
|
||||||
virtual wxSize DoGetBestSize() const;
|
virtual wxSize DoGetBestSize() const;
|
||||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||||
@@ -154,9 +158,6 @@ protected:
|
|||||||
|
|
||||||
virtual void SetClientDataType(wxClientDataType clientDataItemsType);
|
virtual void SetClientDataType(wxClientDataType clientDataItemsType);
|
||||||
|
|
||||||
// implement wxTextEntry pure virtual method
|
|
||||||
virtual wxWindow *GetEditableWindow() { return this; }
|
|
||||||
|
|
||||||
// the subcontrols
|
// the subcontrols
|
||||||
wxComboBoxText* m_text;
|
wxComboBoxText* m_text;
|
||||||
wxComboBoxChoice* m_choice;
|
wxComboBoxChoice* m_choice;
|
||||||
|
@@ -394,6 +394,13 @@ bool wxComboBox::Create(wxWindow *parent,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxString wxComboBox::DoGetValue() const
|
||||||
|
{
|
||||||
|
wxCHECK_MSG( m_text, wxString(), "can't be called for read-only combobox" );
|
||||||
|
|
||||||
|
return m_text->GetValue();
|
||||||
|
}
|
||||||
|
|
||||||
wxString wxComboBox::GetValue() const
|
wxString wxComboBox::GetValue() const
|
||||||
{
|
{
|
||||||
wxString result;
|
wxString result;
|
||||||
|
Reference in New Issue
Block a user