a couple of missing calls to UngetWriteBuf() added

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 680b11b4e3353289d0ffb3818604feb829653f21..4e33f54278948aa48cf32bd1fa7e1626c439d163 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -20,18 +20,26 @@
 
 class wxBitmapButton;
 
 
 class wxBitmapButton;
 

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

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

-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);
   wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
   event.SetEventObject(button);

-  button->ProcessEvent(event);
+  button->GetEventHandler()->ProcessEvent(event);

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -42,14 +50,14 @@ wxBitmapButton::wxBitmapButton(void)
 
 wxBitmapButton::wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
       const wxPoint &pos, const wxSize &size, 
 
 wxBitmapButton::wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
       const wxPoint &pos, const wxSize &size, 

-      const long style, const wxString &name )
+      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, 
 {
   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 wxString &name )

 {
   m_needParent = TRUE;
   
 {
   m_needParent = TRUE;
   


@@ -72,14 +80,12 @@ bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &b
     gtk_container_add( GTK_CONTAINER(m_widget), 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", 
   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();
   
 
   PostCreation();