X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29149a64916d6fdc53e445adca9ef83bc58fb6c3..5d35dca95fed224817455e65e70f9f52ca3e293c:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index ca651c8b61..25567ce369 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -17,8 +17,7 @@ #include "wx/bmpbuttn.h" -#include -#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // classes @@ -199,7 +198,8 @@ wxString wxBitmapButton::GetLabel() const void wxBitmapButton::ApplyWidgetStyle() { - if (GTK_BUTTON(m_widget)->child == NULL) return; + if ( !BUTTON_CHILD(m_widget) ) + return; wxButton::ApplyWidgetStyle(); } @@ -236,8 +236,8 @@ void wxBitmapButton::OnSetBitmap() 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); @@ -246,7 +246,7 @@ void wxBitmapButton::OnSetBitmap() } 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); } }