Test the commit announcement bot some more by fixing more gtk signal callback handler...

[wxWidgets.git] / src / gtk1 / bmpbuttn.cpp

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index b3091ddaa86eff1d02f06d1b78116a78228391f1..1a0d71c0321ab059cb03a4894032cee929547fc7 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,7 +16,7 @@
 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -193,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)
 {
     if ( !BUTTON_CHILD(m_widget) )
 void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     if ( !BUTTON_CHILD(m_widget) )


@@ -235,29 +224,14 @@ void wxBitmapButton::OnSetBitmap()
     {
         // initial bitmap
         GtkWidget *pixmap;
     {
         // 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);
         pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);

-#endif

         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
     }
     else
     {   // subsequent bitmaps
         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);
         GtkPixmap *pixmap = GTK_PIXMAP(child);
         gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);

-#endif

     }
 }
 
     }
 }