X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06b571344581f51bb99e270650c884095d9364fd..9739d9ee8090965862ba623b09a8fba731dc3d5c:/include/wx/msw/statbox.h diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 5256c41f10..e1d5f2e85a 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -6,67 +6,58 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_STATBOX_H_ #define _WX_STATBOX_H_ #ifdef __GNUG__ -#pragma interface "statbox.h" + #pragma interface "statbox.h" #endif #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)) { } - - void OnEraseBackground(wxEraseEvent& event); - + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBoxNameStr); + + // implementation from now on + // -------------------------- + 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; } - -private: - DECLARE_EVENT_TABLE() + +protected: + virtual wxSize DoGetBestSize(); }; #endif