turning on core timer implementation for carbon as well

[wxWidgets.git] / include / wx / gtk / bmpbuttn.h

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 04532e2b2b2aace3ed9af8a6600e2e4d56cfef33..a8a396b8c542049f0b276cf99ad6afe523f62e77 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -7,19 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __BMPBUTTONH__
-#define __BMPBUTTONH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
+#ifndef _WX_GTK_BMPBUTTON_H_
+#define _WX_GTK_BMPBUTTON_H_

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

-class wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase

 {
 public:
     wxBitmapButton() { Init(); }
 {
 public:
     wxBitmapButton() { Init(); }


@@ -48,31 +43,35 @@ public:
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );

-    wxString GetLabel() const;

     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 

-    virtual void SetDefault();
-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);

 
     // implementation
     // --------------
 
 
     // implementation
     // --------------
 

-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-    void ApplyWidgetStyle();
-
-    bool         m_hasFocus:1;
-    bool         m_isSelected:1;
+    void GTKMouseEnters();
+    void GTKMouseLeaves();
+    void GTKPressed();
+    void GTKReleased();

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

+    virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
     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_