test wxExecute() in the sample

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index ca651c8b61467b2fc84dfee1ba72c845d2eed271..25567ce3690b931e64f300b954cef86a27bef3b2 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -17,8 +17,7 @@
 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

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


@@ -199,7 +198,8 @@ wxString wxBitmapButton::GetLabel() const
 
 void wxBitmapButton::ApplyWidgetStyle()
 {
 
 void wxBitmapButton::ApplyWidgetStyle()
 {

-    if (GTK_BUTTON(m_widget)->child == NULL) return;
+    if ( !BUTTON_CHILD(m_widget) )
+        return;

 
     wxButton::ApplyWidgetStyle();
 }
 
     wxButton::ApplyWidgetStyle();
 }


@@ -236,8 +236,8 @@ void wxBitmapButton::OnSetBitmap()
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 

-    GtkButton *bin = GTK_BUTTON(m_widget);
-    if (bin->child == NULL)
+    GtkWidget *child = BUTTON_CHILD(m_widget);
+    if (child == NULL)

     {
         // initial bitmap
         GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
     {
         // initial bitmap
         GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);


@@ -246,7 +246,7 @@ void wxBitmapButton::OnSetBitmap()
     }
     else
     {   // subsequent bitmaps
     }
     else
     {   // subsequent bitmaps

-        GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child);
+        GtkPixmap *g_pixmap = GTK_PIXMAP(child);

         gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
     }
 }
         gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
     }
 }