X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/faa49bfd39592406f8d7a732eb5ae4e25887ca60..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/bmpbuttn.h?ds=inline diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 775d90bb5d..0ac15ef292 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -19,14 +19,14 @@ #include "wx/bitmap.h" #include "wx/button.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. // It has different bitmaps for different states (focused/disabled/pressed) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapButtonBase : public wxButton +class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton { public: wxBitmapButtonBase() @@ -36,15 +36,15 @@ public: } // set the bitmaps - void SetBitmapLabel(const wxBitmap& bitmap) + virtual void SetBitmapLabel(const wxBitmap& bitmap) { m_bmpNormal = bitmap; OnSetBitmap(); } - void SetBitmapSelected(const wxBitmap& sel) - { m_bmpSelected = sel; OnSetBitmap(); }; - void SetBitmapFocus(const wxBitmap& focus) - { m_bmpFocus = focus; OnSetBitmap(); }; - void SetBitmapDisabled(const wxBitmap& disabled) - { m_bmpDisabled = disabled; OnSetBitmap(); }; - void SetBitmapHover(const wxBitmap& hover) + virtual void SetBitmapSelected(const wxBitmap& sel) + { m_bmpSelected = sel; OnSetBitmap(); } + virtual void SetBitmapFocus(const wxBitmap& focus) + { m_bmpFocus = focus; OnSetBitmap(); } + virtual void SetBitmapDisabled(const wxBitmap& disabled) + { m_bmpDisabled = disabled; OnSetBitmap(); } + virtual void SetBitmapHover(const wxBitmap& hover) { m_bmpHover = hover; OnSetBitmap(); } // retrieve the bitmaps @@ -89,7 +89,7 @@ protected: m_marginY; - DECLARE_NO_COPY_CLASS(wxBitmapButtonBase) + wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase); }; #if WXWIN_COMPATIBILITY_2_6 @@ -105,14 +105,18 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap) #include "wx/msw/bmpbuttn.h" #elif defined(__WXMOTIF__) #include "wx/motif/bmpbuttn.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/bmpbuttn.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/bmpbuttn.h" #elif defined(__WXMAC__) - #include "wx/mac/bmpbuttn.h" + #include "wx/osx/bmpbuttn.h" #elif defined(__WXCOCOA__) #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