Rebake from clean wx tree.

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 0f9b28aa62139335e1f6d4a23839df2851275748..aff0c0fe143963ddd4f5e9646749f340b5a07fc3 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.h
+// Name:        wx/msw/bmpbuttn.h

 // Purpose:     wxBitmapButton class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxBitmapButton class
 // Author:      Julian Smart
 // Modified by:


@@ -12,77 +12,60 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 

-#ifdef __GNUG__
-#pragma interface "bmpbuttn.h"
-#endif
-

 #include "wx/button.h"
 #include "wx/bitmap.h"
 #include "wx/button.h"
 #include "wx/bitmap.h"

+#include "wx/brush.h"

 
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLEXPORT wxBitmapButton: public wxButton
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-

 public:
 public:

-    wxBitmapButton() { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
-    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);
+    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 SetLabel(const wxBitmap& bitmap)
+protected:
+    // common part of all ctors
+    void Init()

     {
     {

-        SetBitmapLabel(bitmap);
+        m_disabledSetByUser =
+        m_hoverSetByUser = false;

     }
 
     }
 

-    virtual void SetBitmapLabel(const wxBitmap& bitmap);
-
-#if WXWIN_COMPATIBILITY
-    wxBitmap *GetBitmap() const { return (wxBitmap *) & m_buttonBitmap; }
-#endif
+    // reimplement some base class virtuals
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);

 
 

-    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; }
-    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; }
-    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; }
-    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; }
+    // true if disabled bitmap was set by user, false if we created it
+    // ourselves from the normal one
+    bool m_disabledSetByUser;

 
 

-    void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; };
-    void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; };
-    void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; };
+    // true if hover bitmap was set by user, false if it was set from focused
+    // one
+    bool m_hoverSetByUser;

 
 

-    void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
-    int GetMarginX() const { return m_marginX; }
-    int GetMarginY() const { return m_marginY; }

 
 

-    // Implementation
-    virtual void SetDefault();
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-    virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-    virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-    virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
-
-protected:
-    wxBitmap m_buttonBitmap;
-    wxBitmap m_buttonBitmapSelected;
-    wxBitmap m_buttonBitmapFocus;
-    wxBitmap m_buttonBitmapDisabled;
-    int      m_marginX;
-    int      m_marginY;
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)

 };
 
 };
 

-#endif
-    // _WX_BMPBUTTN_H_
+#endif // _WX_BMPBUTTN_H_