Updated event type declarations to follow what other sub-libraries do these days...

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 3f1c684d63b51a77fa2149e133175b79d4d443d6..a8a396b8c542049f0b276cf99ad6afe523f62e77 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -1,102 +1,77 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbutton.h
+// Name:        wx/gtk/bmpbutton.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_BMPBUTTON_H_
+#define _WX_GTK_BMPBUTTON_H_

 
 

-#ifndef __BMPBUTTONH__
-#define __BMPBUTTONH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_BMPBUTTON
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/bitmap.h"
-#include "wx/button.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxBitmapButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxButtonNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxBitmapButton
 // wxBitmapButton

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

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

 {
 public:
 {
 public:

-    wxBitmapButton();
-    inline wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-                         const wxValidator& validator = wxDefaultValidator,
-                         const wxString& name = wxButtonNameStr )
+    wxBitmapButton() { Init(); }
+
+    wxBitmapButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxBU_AUTODRAW,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxButtonNameStr)

     {
     {

+        Init();
+

         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }

-    bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxButtonNameStr);
-    virtual void SetDefault();
-    
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& bitmap,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxBU_AUTODRAW,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxButtonNameStr);
+

     void SetLabel( const wxString &label );
     void SetLabel( const wxString &label );

-    wxString GetLabel() const;

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

-    
-    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
-    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
-    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
-    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
-    
-    void SetBitmapDisabled( const wxBitmap& bitmap );
-    void SetBitmapFocus( const wxBitmap& bitmap );
-    void SetBitmapLabel( const wxBitmap& bitmap );
-    void SetBitmapSelected( const wxBitmap& bitmap );
-    
-    virtual bool Enable(bool enable);
-  
+
+    virtual bool Enable(bool enable = true);
+

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

-  
-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-    void SetBitmap();
-    void ApplyWidgetStyle();    
-  
-    bool         m_hasFocus;
-    bool         m_isSelected;
-    wxBitmap     m_bitmap; 
-    wxBitmap     m_disabled;
-    wxBitmap     m_focus;
-    wxBitmap     m_selected;   
-  
+
+    void GTKMouseEnters();
+    void GTKMouseLeaves();
+    void GTKPressed();
+    void GTKReleased();
+
+protected:
+    virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    void Init();
+

 private:
 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
-
-#endif // __BMPBUTTONH__
+#endif // _WX_GTK_BMPBUTTON_H_