X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06b571344581f51bb99e270650c884095d9364fd..d9a451ce336b747919cc2e9efc035aaf4ae460b4:/include/wx/msw/statbox.h diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 5256c41f10..361fc3608f 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -18,7 +18,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; // Group box class WXDLLEXPORT wxStaticBox : public wxControl @@ -26,7 +26,7 @@ class WXDLLEXPORT wxStaticBox : public wxControl DECLARE_DYNAMIC_CLASS(wxStaticBox) public: - wxStaticBox() {} + wxStaticBox() { } wxStaticBox(wxWindow *parent, wxWindowID id, const wxString& label, @@ -45,18 +45,10 @@ public: long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual void Command(wxCommandEvent& WXUNUSED(event)) { } - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { } - 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, @@ -65,6 +57,11 @@ public: // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } +protected: + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); + private: DECLARE_EVENT_TABLE() };