X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94aff5ff86189e39b7a95fc62e886374c060a2cf..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/gtk/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 6a02c24538..fcf8ff13bb 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/bmpbuttn.h"
 
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // classes
@@ -35,15 +35,12 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
-    button->GetEventHandler()->ProcessEvent(event);
+    button->HandleWindowEvent(event);
 }
 }
 
@@ -57,7 +54,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->HasFocus();
+    button->GTKMouseEnters();
 }
 }
 
@@ -71,7 +68,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->NotFocus();
+    button->GTKMouseLeaves();
 }
 }
 
@@ -85,7 +82,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->StartSelect();
+    button->GTKPressed();
 }
 }
 
@@ -99,7 +96,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->EndSelect();
+    button->GTKReleased();
 }
 }
 
@@ -109,10 +106,16 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
+BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
+    EVT_SET_FOCUS(wxBitmapButton::OnFocusChange)
+    EVT_KILL_FOCUS(wxBitmapButton::OnFocusChange)
+END_EVENT_TABLE()
+
+
 void wxBitmapButton::Init()
 {
-    m_hasFocus =
-    m_isSelected = false;
+    m_mouseHovers =
+    m_isPressed = false;
 }
 
 bool wxBitmapButton::Create( wxWindow *parent,
@@ -124,8 +127,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
                              const wxValidator& validator,
                              const wxString &name )
 {
-    m_needParent = true;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
@@ -189,29 +190,26 @@ void wxBitmapButton::OnSetBitmap()
     wxBitmap the_one;
     if (!IsThisEnabled())
         the_one = m_bmpDisabled;
-    else if (m_isSelected)
+    else if (m_isPressed)
         the_one = m_bmpSelected;
-    else if (m_hasFocus)
+    else if (m_mouseHovers)
+        the_one = m_bmpHover;
+    else if (HasFocus())
         the_one = m_bmpFocus;
     else
         the_one = m_bmpNormal;
 
-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
+    if (!the_one.Ok())
+        the_one = m_bmpNormal;
+    if (!the_one.Ok())
+        return;
 
     GtkWidget *child = GTK_BIN(m_widget)->child;
     if (child == NULL)
     {
         // initial bitmap
-        GtkWidget *pixmap;
-
-        if (the_one.HasPixbuf())
-            pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
-        else
-            pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
+        GtkWidget *pixmap =
+            gtk_image_new_from_pixbuf(the_one.GetPixbuf());
 
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
@@ -219,10 +217,7 @@ void wxBitmapButton::OnSetBitmap()
     else
     {   // subsequent bitmaps
         GtkImage *pixmap = GTK_IMAGE(child);
-        if (the_one.HasPixbuf())
-            gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
-        else
-            gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
+        gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
     }
 }
 
@@ -241,27 +236,33 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKMouseEnters()
+{
+    m_mouseHovers = true;
+    OnSetBitmap();
+}
+
+void wxBitmapButton::GTKMouseLeaves()
 {
-    m_hasFocus = true;
+    m_mouseHovers = false;
     OnSetBitmap();
 }
 
-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKPressed()
 {
-    m_hasFocus = false;
+    m_isPressed = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::StartSelect()
+void wxBitmapButton::GTKReleased()
 {
-    m_isSelected = true;
+    m_isPressed = false;
     OnSetBitmap();
 }
 
-void wxBitmapButton::EndSelect()
+void wxBitmapButton::OnFocusChange(wxFocusEvent& event)
 {
-    m_isSelected = false;
+    event.Skip();
     OnSetBitmap();
 }