X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/include/wx/panel.h diff --git a/include/wx/panel.h b/include/wx/panel.h index fb5892207f..11fc2c6416 100644 --- a/include/wx/panel.h +++ b/include/wx/panel.h @@ -4,15 +4,69 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id$ // Copyright: (c) Julian Smart +// (c) 2011 Vadim Zeitlin // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PANEL_H_BASE_ #define _WX_PANEL_H_BASE_ -#include "wx/generic/panelg.h" +// ---------------------------------------------------------------------------- +// headers and forward declarations +// ---------------------------------------------------------------------------- +#include "wx/window.h" +#include "wx/containr.h" + +class WXDLLIMPEXP_FWD_CORE wxControlContainer; + +extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; + +// ---------------------------------------------------------------------------- +// wxPanel contains other controls and implements TAB traversal between them +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled +{ +public: + wxPanelBase() { } + + // Derived classes should also provide this constructor: + /* + wxPanelBase(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr); + */ + + // Pseudo ctor + bool Create(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr); + + + // implementation from now on + // -------------------------- + + virtual void InitDialog(); + +private: + wxDECLARE_NO_COPY_CLASS(wxPanelBase); +}; + +#if defined(__WXUNIVERSAL__) + #include "wx/univ/panel.h" +#elif defined(__WXMSW__) + #include "wx/msw/panel.h" +#else + #define wxHAS_GENERIC_PANEL + #include "wx/generic/panelg.h" #endif - // _WX_PANELH_BASE_ + +#endif // _WX_PANELH_BASE_