Fixed Get...String functions.

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index f1a0aa1a465684cff5b39f9da1bbd6769ee54cac..d72416a63cfdf7559fe072fb20be52384016da55 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -20,35 +20,37 @@
 
 class wxBitmapButton;
 
 
 class wxBitmapButton;
 

+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+

 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
 

-void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )

 {
 {

+  if (!button->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  

   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
   button->GetEventHandler()->ProcessEvent(event);
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);
   button->GetEventHandler()->ProcessEvent(event);

-};
+}

 
 //-----------------------------------------------------------------------------
 
 wxBitmapButton::wxBitmapButton(void)
 {
 
 //-----------------------------------------------------------------------------
 
 wxBitmapButton::wxBitmapButton(void)
 {

-};
-
-wxBitmapButton::wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
-{
-  Create( parent, id, bitmap, pos, size, style, name );
-};
+}

 
 bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
       const wxPoint &pos, const wxSize &size, 
 
 bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
       const wxPoint &pos, const wxSize &size, 

-      long style, const wxString &name )
+      long style, const wxValidator& validator, const wxString &name )

 {
   m_needParent = TRUE;
   
 {
   m_needParent = TRUE;
   


@@ -56,6 +58,8 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
 
   PreCreation( parent, id, pos, newSize, style, name );
   
 
   PreCreation( parent, id, pos, newSize, style, name );
   

+  SetValidator( validator );
+

   m_bitmap = bitmap;
   m_label = "";
   
   m_bitmap = bitmap;
   m_label = "";
   


@@ -63,13 +67,13 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
   
   if (m_bitmap.Ok())
   {
   
   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 (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;
   
   if (newSize.x == -1) newSize.x = m_bitmap.GetHeight()+10;
   if (newSize.y == -1) newSize.y = m_bitmap.GetWidth()+10;


@@ -83,18 +87,40 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
   Show( TRUE );
     
   return TRUE;
   Show( TRUE );
     
   return TRUE;

-};
+}

       
 void wxBitmapButton::SetDefault(void)
 {
       
 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 );
 
 void wxBitmapButton::SetLabel( const wxString &label )
 {
   wxControl::SetLabel( label );

-};
+}

 
 wxString wxBitmapButton::GetLabel(void) const
 {
   return wxControl::GetLabel();
 
 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 );
+}
+
+
+
+