don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 380642dc6ab4d16953cb095db3de3e880d4aaa55..f4d71460df7ae126d2d614ae116f73ebcb7e62fc 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -1,71 +1,79 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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 __BMPBUTTONH__
 #define __BMPBUTTONH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+// ----------------------------------------------------------------------------
+// wxBitmapButton
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+class wxBitmapButton: public wxBitmapButtonBase
+{
+public:
+    wxBitmapButton() { Init(); }

 
 

-class wxBitmapButton;
+    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();

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+        Create(parent, id, bitmap, pos, size, style, validator, name);
+    }

 
 

-extern const char *wxButtonNameStr;
+    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);

 
 

-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
+    void SetLabel( const wxString &label );
+    wxString GetLabel() const;
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }

 
 

-class wxBitmapButton: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    virtual void SetDefault();
+    virtual bool Enable(bool enable = TRUE);

 
 

-  public:
+    // implementation
+    // --------------

 
 

-    wxBitmapButton(void);
-    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)
-    {
-      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);
-    void SetDefault(void);
-    void SetLabel( const wxString &label );
-    wxString GetLabel(void) const;
-    virtual void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); }
-    virtual void SetBitmapLabel( const wxBitmap& bitmap );
-    wxBitmap& GetBitmapLabel(void) const { return (wxBitmap&) m_bitmap; }
-    
-  public:
-  
-    wxBitmap   m_bitmap;    
-    
+    void HasFocus();
+    void NotFocus();
+    void StartSelect();
+    void EndSelect();
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    bool         m_hasFocus:1;
+    bool         m_isSelected:1;
+
+protected:
+    virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
+
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)

 };
 };

+

 #endif // __BMPBUTTONH__
 #endif // __BMPBUTTONH__