X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210a651b4f4ef5ff4e220a100a10bb4f29e08cfd..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/os2/checkbox.h diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index 6079d5f80a..e03084b29b 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: checkbox.h +// Name: wx/os2/checkbox.h // Purpose: wxCheckBox class // Author: David Webster // Modified by: @@ -14,80 +14,104 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr; - // Checkbox item (single checkbox) -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: - inline wxCheckBox() { } - inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } + inline wxCheckBox() { } + inline wxCheckBox( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ) + { + Create( pParent + ,vId + ,rsLabel + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxCheckBoxNameStr); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ); - virtual void SetValue(bool); - virtual bool GetValue() const ; + virtual void SetValue(bool bValue); + virtual bool GetValue(void) const ; - virtual bool OS2Command(WXUINT param, WXWORD id); - virtual void SetLabel(const wxString& label); - virtual void Command(wxCommandEvent& event); - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + virtual bool OS2Command( WXUINT uParam + ,WXWORD wId + ); + virtual void SetLabel(const wxString& rsLabel); + virtual void Command(wxCommandEvent& rEvent); protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize(void) const; private: DECLARE_DYNAMIC_CLASS(wxCheckBox) }; -class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox +class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox { - DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) - public: - int checkWidth ; - int checkHeight ; - inline wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; } - inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } + inline wxBitmapCheckBox() { m_nCheckWidth = -1; m_nCheckHeight = -1; } + inline wxBitmapCheckBox( wxWindow* pParent + ,wxWindowID vId + ,const wxBitmap* pLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ) + { + Create( pParent + ,vId + ,pLabel + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } - bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxCheckBoxNameStr); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxBitmap* pLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ); + + virtual void SetLabel(const wxBitmap& rBitmap); + + int m_nCheckWidth; + int m_nCheckHeight; - virtual void SetLabel(const wxBitmap& bitmap); private: - virtual void SetLabel(const wxString& string) - { wxCheckBox::SetLabel(string); }; + + virtual void SetLabel(const wxString& rsString) + { wxCheckBox::SetLabel(rsString); } + DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) }; #endif // _WX_CHECKBOX_H_