X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54da4255a20216b070ec044ae2b8af75e9f2681f..f2049b683752950d1fe91aec07318e7f2122ff16:/include/wx/os2/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index ad8c3c25e9..b65a642b8d 100644 --- a/include/wx/os2/bmpbuttn.h +++ b/include/wx/os2/bmpbuttn.h @@ -1,86 +1,89 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.h +// Name: wx/os2/bmpbuttn.h // Purpose: wxBitmapButton class -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/13/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BMPBUTTN_H_ #define _WX_BMPBUTTN_H_ -#ifdef __GNUG__ -#pragma interface "bmpbuttn.h" -#endif - #include "wx/button.h" +#include "wx/dcclient.h" -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; +WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLEXPORT wxBitmapButton: public wxButton +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { - DECLARE_DYNAMIC_CLASS(wxBitmapButton) - public: - inline wxBitmapButton() { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; } - inline 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) - { - 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); +public: + inline wxBitmapButton() + { + m_marginX = wxDEFAULT_BUTTON_MARGIN; + m_marginY = wxDEFAULT_BUTTON_MARGIN; + } + inline wxBitmapButton( wxWindow* pParent + ,wxWindowID vId + ,const wxBitmap& rBitmap + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxBU_AUTODRAW + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxButtonNameStr + ) + { + Create( pParent + ,vId + ,rBitmap + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } - virtual void SetLabel(const wxBitmap& bitmap) - { - SetBitmapLabel(bitmap); - } + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxBitmap& rBitmap + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxBU_AUTODRAW + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxButtonNameStr + ); - virtual void SetBitmapLabel(const wxBitmap& bitmap); + virtual void SetLabel(const wxBitmap& rBitmap) + { + SetBitmapLabel(rBitmap); + } - inline wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; } - inline wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; } - inline wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; } - inline wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; } + // + // Implementation + // + virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem); - inline void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; }; - inline void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; }; - inline void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; }; +private: - inline void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; } - inline int GetMarginX() { return m_marginX; } - inline int GetMarginY() { return m_marginY; } + virtual void DrawFace( wxClientDC& rDC + ,bool bSel + ); + virtual void DrawButtonFocus(wxClientDC& rDC); + virtual void DrawButtonDisable( wxClientDC& rDC + ,wxBitmap& rBmp + ); + DECLARE_DYNAMIC_CLASS(wxBitmapButton) -/* - // TODO: Implementation - 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 ); -*/ + virtual void SetLabel(const wxString& rsString) + { + wxButton::SetLabel(rsString); + } +}; // end of CLASS wxBitmapButton - protected: - wxBitmap m_buttonBitmap; - wxBitmap m_buttonBitmapSelected; - wxBitmap m_buttonBitmapFocus; - wxBitmap m_buttonBitmapDisabled; - int m_marginX; - int m_marginY; -private: - virtual void SetLabel(const wxString& string) - { wxButton::SetLabel(string); }; -}; +#endif // _WX_BMPBUTTN_H_ -#endif - // _WX_BMPBUTTN_H_