X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903f689bf7c3c379cba45881373aa9bdd15d6e70..f4a4bd13d46c34069661766e9d3d2cfbdd0dbb86:/src/gtk/bmpbuttn.cpp

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 2ed2cd4bab..71c35e39ca 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -2,9 +2,8 @@
 // Name:        bmpbuttn.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -27,11 +26,9 @@ class wxBitmapButton;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// wxBitmapButton
+// "clicked"
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
-
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
   if (!button->HasVMT()) return;
@@ -43,6 +40,10 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
 }
 
 //-----------------------------------------------------------------------------
+// wxBitmapButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
 
 wxBitmapButton::wxBitmapButton(void)
 {
@@ -67,7 +68,7 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
   
   if (m_bitmap.Ok())
   {
-    GdkBitmap *mask = NULL;
+    GdkBitmap *mask = (GdkBitmap *) NULL;
     if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
     GtkWidget *pixmap = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
     
@@ -84,6 +85,8 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
 
   PostCreation();
   
+  SetBackgroundColour( parent->GetBackgroundColour() );
+
   Show( TRUE );
     
   return TRUE;
@@ -99,28 +102,31 @@ void wxBitmapButton::SetDefault(void)
 
 void wxBitmapButton::SetLabel( const wxString &label )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid button" );
+
   wxControl::SetLabel( label );
 }
 
 wxString wxBitmapButton::GetLabel(void) const
 {
+  wxCHECK_MSG( m_widget != NULL, "", "invalid button" );
+
   return wxControl::GetLabel();
 }
 
 void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid button" );
+
   m_bitmap = bitmap;
   if (!m_bitmap.Ok()) return;
   
   GtkButton *bin = GTK_BUTTON( m_widget );
   GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
   
-  GdkBitmap *mask = NULL;
+  GdkBitmap *mask = (GdkBitmap *) NULL;
   if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
   
   gtk_pixmap_set( g_pixmap, m_bitmap.GetPixmap(), mask );
 }
 
-
-
-