// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_GENERIC_PANEL_H_
-#define _WX_GENERIC_PANEL_H_
+#ifndef _WX_GENERIC_PANELG_H_
+#define _WX_GENERIC_PANELG_H_
-#ifdef __GNUG__
- #pragma interface "panelg.h"
-#endif
+#include "wx/bitmap.h"
-// ----------------------------------------------------------------------------
-// headers and forward declarations
-// ----------------------------------------------------------------------------
-
-#include "wx/window.h"
-#include "wx/containr.h"
-
-class WXDLLEXPORT wxControlContainer;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
-
-// ----------------------------------------------------------------------------
-// wxPanel contains other controls and implements TAB traversal between them
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxPanel : public wxWindow
+class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
{
public:
- wxPanel() { Init(); }
+ wxPanel() { }
- // Old-style constructor (no default values for coordinates to avoid
- // ambiguity with the new one)
+ // Constructor
wxPanel(wxWindow *parent,
- int x, int y, int width, int height,
+ wxWindowID winid = wxID_ANY,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr)
{
- Init();
-
- Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
+ Create(parent, winid, pos, size, style, name);
}
- // Constructor
+#ifdef WXWIN_COMPATIBILITY_2_8
+ wxDEPRECATED_CONSTRUCTOR(
wxPanel(wxWindow *parent,
- wxWindowID id = -1,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
+ int x, int y, int width, int height,
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr)
{
- Init();
-
- Create(parent, id, pos, size, style, name);
+ Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
}
-
- // Pseudo ctor
- bool Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxTAB_TRAVERSAL | wxNO_BORDER,
- const wxString& name = wxPanelNameStr);
-
- virtual ~wxPanel();
-
- // implementation from now on
- // --------------------------
-
- // responds to colour changes
- void OnSysColourChanged(wxSysColourChangedEvent& event);
-
- // calls layout for layout constraints and sizers
- void OnSize(wxSizeEvent& event);
-
- virtual void InitDialog();
-
-#ifdef __WXUNIVERSAL__
- virtual bool ProvidesBackground() { return TRUE; }
-#endif
-
- WX_DECLARE_CONTROL_CONTAINER();
-
-protected:
- // common part of all ctors
- void Init();
+ )
+#endif // WXWIN_COMPATIBILITY_2_8
private:
- DECLARE_DYNAMIC_CLASS(wxPanel)
- DECLARE_EVENT_TABLE()
+ wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
};
-#endif
- // _WX_GENERIC_PANEL_H_
+#endif // _WX_GENERIC_PANELG_H_