X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index 1cb6a708ec..8d5475a46d 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -19,15 +19,15 @@ #include "wx/window.h" #include "wx/containr.h" -class WXDLLEXPORT wxControlContainer; +class WXDLLIMPEXP_FWD_CORE wxControlContainer; -extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; // ---------------------------------------------------------------------------- // wxPanel contains other controls and implements TAB traversal between them // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPanel : public wxWindow +class WXDLLIMPEXP_CORE wxPanel : public wxWindow { public: wxPanel() { Init(); } @@ -58,7 +58,8 @@ public: } // Pseudo ctor - bool Create(wxWindow *parent, wxWindowID winid, + bool Create(wxWindow *parent, + wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, @@ -78,14 +79,15 @@ public: virtual bool IsCanvasWindow() const { return true; } #endif - WX_DECLARE_CONTROL_CONTAINER(); protected: // common part of all ctors void Init(); -private: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); } + DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel) DECLARE_EVENT_TABLE() };