X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..a0a302dcba6d7f6828f221f7341ee8a8cbcd8e96:/include/wx/msw/statbox.h diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index fbd5e150c3..3f15d25e37 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -5,12 +5,12 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __STATBOXH__ -#define __STATBOXH__ +#ifndef _WX_STATBOX_H_ +#define _WX_STATBOX_H_ #ifdef __GNUG__ #pragma interface "statbox.h" @@ -27,21 +27,21 @@ class WXDLLEXPORT wxStaticBox: public wxControl public: inline wxStaticBox(void) {} - inline wxStaticBox(wxWindow *parent, const wxWindowID id, + inline wxStaticBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = 0, + long style = 0, const wxString& name = wxStaticBoxNameStr) { Create(parent, id, label, pos, size, style, name); } - bool Create(wxWindow *parent, const wxWindowID id, + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = 0, + long style = 0, const wxString& name = wxStaticBoxNameStr); virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; @@ -51,13 +51,16 @@ class WXDLLEXPORT wxStaticBox: public wxControl virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO); + void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO) + { wxWindow::SetSize(rect, sizeFlags); } + void SetSize(const wxSize& size) { wxWindow::SetSize(size); } void SetLabel(const wxString& label); - virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, + virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); DECLARE_EVENT_TABLE() }; #endif - // __STATBOXH__ + // _WX_STATBOX_H_