removed GetLabel() which didn't do anything but forwarding to wxControl version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,7 +44,6 @@ public:
|
|||||||
const wxString& name = wxButtonNameStr);
|
const wxString& name = wxButtonNameStr);
|
||||||
|
|
||||||
void SetLabel( const wxString &label );
|
void SetLabel( const wxString &label );
|
||||||
wxString GetLabel() const;
|
|
||||||
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
|
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
|
||||||
|
|
||||||
virtual void SetDefault();
|
virtual void SetDefault();
|
||||||
|
@@ -44,7 +44,6 @@ public:
|
|||||||
const wxString& name = wxButtonNameStr);
|
const wxString& name = wxButtonNameStr);
|
||||||
|
|
||||||
void SetLabel( const wxString &label );
|
void SetLabel( const wxString &label );
|
||||||
wxString GetLabel() const;
|
|
||||||
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
|
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
|
||||||
|
|
||||||
virtual void SetDefault();
|
virtual void SetDefault();
|
||||||
|
@@ -189,13 +189,6 @@ void wxBitmapButton::SetLabel( const wxString &label )
|
|||||||
wxControl::SetLabel( label );
|
wxControl::SetLabel( label );
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxBitmapButton::GetLabel() const
|
|
||||||
{
|
|
||||||
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") );
|
|
||||||
|
|
||||||
return wxControl::GetLabel();
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
|
void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
|
||||||
{
|
{
|
||||||
if ( !BUTTON_CHILD(m_widget) )
|
if ( !BUTTON_CHILD(m_widget) )
|
||||||
|
@@ -189,13 +189,6 @@ void wxBitmapButton::SetLabel( const wxString &label )
|
|||||||
wxControl::SetLabel( label );
|
wxControl::SetLabel( label );
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxBitmapButton::GetLabel() const
|
|
||||||
{
|
|
||||||
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") );
|
|
||||||
|
|
||||||
return wxControl::GetLabel();
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
|
void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
|
||||||
{
|
{
|
||||||
if ( !BUTTON_CHILD(m_widget) )
|
if ( !BUTTON_CHILD(m_widget) )
|
||||||
|
Reference in New Issue
Block a user