X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/902725eefee5a402d21d13b2630583ab28ae3931..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index b3091ddaa8..62f3509404 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/bmpbuttn.cpp +// Name: src/gtk1/bmpbuttn.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,20 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bmpbuttn.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_BMPBUTTON #include "wx/bmpbuttn.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // classes @@ -178,14 +172,6 @@ bool wxBitmapButton::Create( wxWindow *parent, return true; } -void wxBitmapButton::SetDefault() -{ - GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); - gtk_widget_grab_default( m_widget ); - - SetSize( m_x, m_y, m_width, m_height ); -} - void wxBitmapButton::SetLabel( const wxString &label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); @@ -193,13 +179,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) ) @@ -215,7 +194,7 @@ void wxBitmapButton::OnSetBitmap() InvalidateBestSize(); wxBitmap the_one; - if (!m_isEnabled) + if (!IsThisEnabled()) the_one = m_bmpDisabled; else if (m_isSelected) the_one = m_bmpSelected; @@ -235,29 +214,14 @@ void wxBitmapButton::OnSetBitmap() { // initial bitmap GtkWidget *pixmap; -#ifdef __WXGTK20__ - if (the_one.HasPixbuf()) - pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf()); - else - pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask); -#else pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); -#endif gtk_widget_show(pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap); } else { // subsequent bitmaps -#ifdef __WXGTK20__ - GtkImage *pixmap = GTK_IMAGE(child); - if (the_one.HasPixbuf()) - gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf()); - else - gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask); -#else GtkPixmap *pixmap = GTK_PIXMAP(child); gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask); -#endif } } @@ -301,4 +265,3 @@ void wxBitmapButton::EndSelect() } #endif // wxUSE_BMPBUTTON -