X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a56f55c02d718e9da7574807cb01e4d2cf6a1fa..560b92f577ddd77b1f44eece2b33543608eb52af:/src/gtk1/bmpbuttn.cpp

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 23909f6f3f..25968dbcd8 100644
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -21,35 +21,38 @@
 class wxBitmapButton;
 
 //-----------------------------------------------------------------------------
-// wxBitmapButton
+// data
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "clicked"
+//-----------------------------------------------------------------------------
 
-void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-  wxBitmapButton *button = (wxBitmapButton*)data;
+  if (!button->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
-  button->ProcessEvent(event);
-};
+  button->GetEventHandler()->ProcessEvent(event);
+}
 
+//-----------------------------------------------------------------------------
+// wxBitmapButton
 //-----------------------------------------------------------------------------
 
-wxBitmapButton::wxBitmapButton(void)
-{
-};
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
 
-wxBitmapButton::wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name )
+wxBitmapButton::wxBitmapButton(void)
 {
-  Create( parent, id, bitmap, pos, size, style, name );
-};
+}
 
 bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
       const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name )
+      long style, const wxValidator& validator, const wxString &name )
 {
   m_needParent = TRUE;
   
@@ -57,6 +60,8 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
 
   PreCreation( parent, id, pos, newSize, style, name );
   
+  SetValidator( validator );
+
   m_bitmap = bitmap;
   m_label = "";
   
@@ -64,38 +69,60 @@ 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 );
     
     gtk_widget_show( pixmap );
     gtk_container_add( GTK_CONTAINER(m_widget), pixmap );
-  };
+  }
   
   if (newSize.x == -1) newSize.x = m_bitmap.GetHeight()+10;
   if (newSize.y == -1) newSize.y = m_bitmap.GetWidth()+10;
   SetSize( newSize.x, newSize.y );
   
   gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+    GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
   PostCreation();
   
   Show( TRUE );
     
   return TRUE;
-};
+}
       
 void wxBitmapButton::SetDefault(void)
 {
-};
+/*
+  GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+  gtk_widget_grab_default( m_widget );
+*/
+}
 
 void wxBitmapButton::SetLabel( const wxString &label )
 {
   wxControl::SetLabel( label );
-};
+}
 
 wxString wxBitmapButton::GetLabel(void) const
 {
   return wxControl::GetLabel();
-};
+}
+
+void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
+{
+  m_bitmap = bitmap;
+  if (!m_bitmap.Ok()) return;
+  
+  GtkButton *bin = GTK_BUTTON( m_widget );
+  GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
+  
+  GdkBitmap *mask = (GdkBitmap *) NULL;
+  if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
+  
+  gtk_pixmap_set( g_pixmap, m_bitmap.GetPixmap(), mask );
+}
+
+
+
+