X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/osx/bmpbuttn.h diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h index 265d2757bd..e55856496e 100644 --- a/include/wx/osx/bmpbuttn.h +++ b/include/wx/osx/bmpbuttn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.h +// Name: wx/osx/bmpbuttn.h // Purpose: wxBitmapButton class // Author: Stefan Csomor // Modified by: @@ -9,25 +9,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BMPBUTTN_H_ -#define _WX_BMPBUTTN_H_ +#ifndef _WX_OSX_BMPBUTTN_H_ +#define _WX_OSX_BMPBUTTN_H_ #include "wx/button.h" -WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; - #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { - DECLARE_DYNAMIC_CLASS(wxBitmapButton) - public: wxBitmapButton() { SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN); } - + wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, @@ -43,11 +39,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void SetBitmapLabel(const wxBitmap& bitmap); - protected: - virtual wxSize DoGetBestSize() const; + + virtual wxSize DoGetBestSize() const; + + DECLARE_DYNAMIC_CLASS(wxBitmapButton) }; -#endif - // _WX_BMPBUTTN_H_ +#endif // _WX_OSX_BMPBUTTN_H_