From d1d40c21761d5e523e90584152eaabb2e05afa9b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 18 Dec 2005 16:34:17 +0000 Subject: [PATCH] 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 --- include/wx/gtk/bmpbuttn.h | 1 - include/wx/gtk1/bmpbuttn.h | 1 - src/gtk/bmpbuttn.cpp | 7 ------- src/gtk1/bmpbuttn.cpp | 7 ------- 4 files changed, 16 deletions(-) diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index e9ce6586d1..a6a6bc1b51 100644 --- a/include/wx/gtk/bmpbuttn.h +++ b/include/wx/gtk/bmpbuttn.h @@ -44,7 +44,6 @@ public: const wxString& name = wxButtonNameStr); void SetLabel( const wxString &label ); - wxString GetLabel() const; virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } virtual void SetDefault(); diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h index e9ce6586d1..a6a6bc1b51 100644 --- a/include/wx/gtk1/bmpbuttn.h +++ b/include/wx/gtk1/bmpbuttn.h @@ -44,7 +44,6 @@ public: const wxString& name = wxButtonNameStr); void SetLabel( const wxString &label ); - wxString GetLabel() const; virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } virtual void SetDefault(); diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index b71a04884d..8ab5eaa6cd 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -189,13 +189,6 @@ void wxBitmapButton::SetLabel( const wxString &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) { if ( !BUTTON_CHILD(m_widget) ) diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index b71a04884d..8ab5eaa6cd 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -189,13 +189,6 @@ void wxBitmapButton::SetLabel( const wxString &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) { if ( !BUTTON_CHILD(m_widget) ) -- 2.45.2