no message

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 2ed2cd4bab9521377817ecadc340a8d702a7f4bb..25968dbcd8a3c302aea3e8d1eaf1a5bf7aecbe17 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -27,11 +27,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 +41,10 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
 }
 
 //-----------------------------------------------------------------------------
+// wxBitmapButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
 
 wxBitmapButton::wxBitmapButton(void)
 {
@@ -67,7 +69,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 );
     
@@ -115,7 +117,7 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
   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 );