X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4438caf41af49f00f3c8137ac801871f59cce386..e951b8e4e6c07fe5d5200b8cbf6148e7317aa0e5:/include/wx/msw/statbox.h diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 87393c2f47..4109ac7a19 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -6,66 +6,46 @@ // 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" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma interface "statbox.h" #endif -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; - // Group box -class WXDLLEXPORT wxStaticBox : public wxControl +class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase { -DECLARE_DYNAMIC_CLASS(wxStaticBox) - public: 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); - - // implementation from now on - // -------------------------- - - void OnEraseBackground(wxEraseEvent& event); - - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - 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; } + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBoxNameStr); protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual wxSize DoGetBestSize(); + virtual wxSize DoGetBestSize() const; + + virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC); private: - DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox) }; #endif