X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e4c2912462461f9a2133ac39475457d668d1686..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/bmpbuttn.h diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index a355111bc9..fb1ed6f603 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/bmpbutton.h +// Name: wx/bmpbuttn.h // Purpose: wxBitmapButton class interface // Author: Vadim Zeitlin // Modified by: @@ -18,13 +18,15 @@ #include "wx/button.h" -// FIXME: right now only wxMSW and wxGTK implement bitmap support in wxButton +// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton // itself, this shouldn't be used for the other platforms neither // when all of them do it -#if (defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) +#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__) #define wxHAS_BUTTON_BITMAP #endif +class WXDLLIMPEXP_FWD_CORE wxBitmapButton; + // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. // It has different bitmaps for different states (focused/disabled/pressed) @@ -43,7 +45,6 @@ public: bool Create(wxWindow *parent, wxWindowID winid, - const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, @@ -59,11 +60,18 @@ public: // And we also use wxBU_EXACTFIT to avoid being resized up to the // standard button size as this doesn't make sense for bitmap buttons // which are not standard anyhow and should fit their bitmap size. - return wxButton::Create(parent, id, pos, size, + return wxButton::Create(parent, winid, "", + pos, size, style | wxBU_NOTEXT | wxBU_EXACTFIT, validator, name); } + // Special creation function for a standard "Close" bitmap. It allows to + // simply create a close button with the image appropriate for the common + // platform. + static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid); + + // set/get the margins around the button virtual void SetMargins(int x, int y) { @@ -130,8 +138,6 @@ protected: #include "wx/cocoa/bmpbuttn.h" #elif defined(__WXPM__) #include "wx/os2/bmpbuttn.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/bmpbuttn.h" #endif #endif // wxUSE_BMPBUTTON