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

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 19eb664d1c7cff06b00267b423be9ca31c0d12c2..4fb37f2a276f552ea64e4811f9fe6cabe7e77d9e 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __BMPBUTTONH__
-#define __BMPBUTTONH__
+#ifndef _WX_GTK_BMPBUTTON_H_
+#define _WX_GTK_BMPBUTTON_H_

 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton


@@ -51,13 +50,10 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    void GTKHasFocus();
-    void GTKNotFocus();
-    void GTKStartSelect();
-    void GTKEndSelect();
-
-    bool         m_hasFocus:1;
-    bool         m_isSelected:1;
+    void GTKMouseEnters();
+    void GTKMouseLeaves();
+    void GTKPressed();
+    void GTKReleased();

 
 protected:
     virtual void OnSetBitmap();
 
 protected:
     virtual void OnSetBitmap();


@@ -67,7 +63,15 @@ protected:
     void Init();
 
 private:
     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_DYNAMIC_CLASS(wxBitmapButton)

+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#endif // __BMPBUTTONH__
+#endif // _WX_GTK_BMPBUTTON_H_

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index ac1cec221d1a2f36b7e528fa3d64d348c47506e8..fcf8ff13bb969971116dda7953114e0012bc85ef 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/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;
 
     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;
 
     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;
 
     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;
 
     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)
 
 
 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()
 {
 void wxBitmapButton::Init()
 {

-    m_hasFocus =
-    m_isSelected = false;
+    m_mouseHovers =
+    m_isPressed = false;

 }
 
 bool wxBitmapButton::Create( wxWindow *parent,
 }
 
 bool wxBitmapButton::Create( wxWindow *parent,


@@ -184,21 +190,25 @@ void wxBitmapButton::OnSetBitmap()
     wxBitmap the_one;
     if (!IsThisEnabled())
         the_one = m_bmpDisabled;
     wxBitmap the_one;
     if (!IsThisEnabled())
         the_one = m_bmpDisabled;

-    else if (m_isSelected)
+    else if (m_isPressed)

         the_one = m_bmpSelected;
         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;
 
         the_one = m_bmpFocus;
     else
         the_one = m_bmpNormal;
 

-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
+    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 *child = GTK_BIN(m_widget)->child;
     if (child == NULL)
     {
         // initial bitmap

-        GtkWidget *pixmap = 
+        GtkWidget *pixmap =

             gtk_image_new_from_pixbuf(the_one.GetPixbuf());
 
         gtk_widget_show(pixmap);
             gtk_image_new_from_pixbuf(the_one.GetPixbuf());
 
         gtk_widget_show(pixmap);


@@ -226,27 +236,33 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::GTKHasFocus()
+void wxBitmapButton::GTKMouseEnters()
+{
+    m_mouseHovers = true;
+    OnSetBitmap();
+}
+
+void wxBitmapButton::GTKMouseLeaves()

 {
 {

-    m_hasFocus = true;
+    m_mouseHovers = false;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxBitmapButton::GTKNotFocus()
+void wxBitmapButton::GTKPressed()

 {
 {

-    m_hasFocus = false;
+    m_isPressed = true;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxBitmapButton::GTKStartSelect()
+void wxBitmapButton::GTKReleased()

 {
 {

-    m_isSelected = true;
+    m_isPressed = false;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxBitmapButton::GTKEndSelect()
+void wxBitmapButton::OnFocusChange(wxFocusEvent& event)

 {
 {

-    m_isSelected = false;
+    event.Skip();

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }