X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06b571344581f51bb99e270650c884095d9364fd..9199e66fb56bc80b81b91f59250df78d7197052e:/include/wx/msw/statbox.h diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 5256c41f10..acd5511c8c 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -18,53 +18,49 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; // Group box class WXDLLEXPORT wxStaticBox : public wxControl { DECLARE_DYNAMIC_CLASS(wxStaticBox) - + public: - wxStaticBox() {} + wxStaticBox() { } wxStaticBox(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBoxNameStr) + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBoxNameStr) { Create(parent, id, label, pos, size, style, name); } - + bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBoxNameStr); - - virtual void Command(wxCommandEvent& WXUNUSED(event)) { } - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { } - + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBoxNameStr); + + // implementation from now on + // -------------------------- + void OnEraseBackground(wxEraseEvent& event); - + virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - 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(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - + // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } - + +protected: + virtual wxSize DoGetBestSize(); + private: DECLARE_EVENT_TABLE() };