X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/bmpbuttn.h diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index f1716a5473..2d67ad67ae 100644 --- 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: @@ -12,20 +12,15 @@ #ifndef _WX_BMPBUTTN_H_ #define _WX_BMPBUTTN_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "bmpbuttn.h" -#endif - #include "wx/button.h" #include "wx/bitmap.h" +#include "wx/brush.h" -#define wxDEFAULT_BUTTON_MARGIN 4 - -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() - { m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; } + wxBitmapButton() {} + wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -47,19 +42,9 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - // 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: - virtual wxSize DoGetBestSize() const; - -private: + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton) }; -#endif - // _WX_BMPBUTTN_H_ +#endif // _WX_BMPBUTTN_H_