fixed wxBitmapButton to use focus and hover bitmaps correctly; also fixed tons of misnomers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/bmpbuttn.h

@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
+#ifndef _WX_GTK_BMPBUTTON_H_
-#ifndef __BMPBUTTONH__
+#define _WX_GTK_BMPBUTTON_H_
-#define __BMPBUTTONH__
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
@@ -51,13 +50,10 @@ public:
     // implementation
     // --------------
 
-    void GTKHasFocus();
+    void GTKMouseEnters();
-    void GTKNotFocus();
+    void GTKMouseLeaves();
-    void GTKStartSelect();
+    void GTKPressed();
-    void GTKEndSelect();
+    void GTKReleased();
-
-    bool         m_hasFocus:1;
-    bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();
@@ -67,7 +63,15 @@ protected:
     void Init();
 
 private:
+    void OnFocusChange(wxFocusEvent& event);
+
+    // true iff mouse hovers over the button
+    bool         m_mouseHovers;
+    // true iff the button is in pressed state
+    bool         m_isPressed;
+
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    DECLARE_EVENT_TABLE()
 };
 
-#endif // __BMPBUTTONH__
+#endif // _WX_GTK_BMPBUTTON_H_

src/gtk/bmpbuttn.cpp

@@ -54,7 +54,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->GTKHasFocus();
+    button->GTKMouseEnters();
 }
 }
 
@@ -68,7 +68,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->GTKNotFocus();
+    button->GTKMouseLeaves();
 }
 }
 
@@ -82,7 +82,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->GTKStartSelect();
+    button->GTKPressed();
 }
 }
 
@@ -96,7 +96,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->GTKEndSelect();
+    button->GTKReleased();
 }
 }
 
@@ -106,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_mouseHovers =
-    m_isSelected = false;
+    m_isPressed = false;
 }
 
 bool wxBitmapButton::Create( wxWindow *parent,
@@ -184,15 +190,19 @@ 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())
-    if (!the_one.Ok()) return;
+        the_one = m_bmpNormal;
+    if (!the_one.Ok())
+        return;
 
     GtkWidget *child = GTK_BIN(m_widget)->child;
     if (child == NULL)
@@ -226,27 +236,33 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
-void wxBitmapButton::GTKHasFocus()
+void wxBitmapButton::GTKMouseEnters()
 {
-    m_hasFocus = true;
+    m_mouseHovers = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::GTKNotFocus()
+void wxBitmapButton::GTKMouseLeaves()
 {
-    m_hasFocus = false;
+    m_mouseHovers = false;
     OnSetBitmap();
 }
 
-void wxBitmapButton::GTKStartSelect()
+void wxBitmapButton::GTKPressed()
 {
-    m_isSelected = true;
+    m_isPressed = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::GTKEndSelect()
+void wxBitmapButton::GTKReleased()
 {
-    m_isSelected = false;
+    m_isPressed = false;
+    OnSetBitmap();
+}
+
+void wxBitmapButton::OnFocusChange(wxFocusEvent& event)
+{
+    event.Skip();
     OnSetBitmap();
 }