X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f35e5eeca672d1772daec728fbea68d668bc4ea..497209d3b7b6e0d80734eabcd5a24b732f13ac42:/include/wx/gtk/bmpbuttn.h

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 19eb664d1c..a8a396b8c5 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __BMPBUTTONH__
-#define __BMPBUTTONH__
+#ifndef _WX_GTK_BMPBUTTON_H_
+#define _WX_GTK_BMPBUTTON_H_
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
@@ -46,18 +45,15 @@ public:
     void SetLabel( const wxString &label );
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);
 
     // 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();
@@ -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_