// 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_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "panelg.h"
#endif
class WXDLLEXPORT wxControlContainer;
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
// ----------------------------------------------------------------------------
// wxPanel contains other controls and implements TAB traversal between them
class WXDLLEXPORT wxPanel : public wxWindow
{
public:
- wxPanel() : m_container(this) { Init(); }
+ wxPanel() { Init(); }
// Old-style constructor (no default values for coordinates to avoid
// ambiguity with the new one)
int x, int y, int width, int height,
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr)
- : m_container(this)
{
Init();
- Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
+ Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
}
// Constructor
wxPanel(wxWindow *parent,
- wxWindowID id = -1,
+ wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxPanelNameStr)
- : m_container(this)
{
Init();
- Create(parent, id, pos, size, style, name);
+ Create(parent, winid, pos, size, style, name);
}
// Pseudo ctor
- bool Create(wxWindow *parent, wxWindowID id,
+ bool Create(wxWindow *parent, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
// implementation from now on
// --------------------------
- // Sends an OnInitDialog event, which in turns transfers data to
- // to the dialog via validators.
+ // calls layout for layout constraints and sizers
+ void OnSize(wxSizeEvent& event);
+
virtual void InitDialog();
- // responds to colour changes
- void OnSysColourChanged(wxSysColourChangedEvent& event);
+#ifdef __WXUNIVERSAL__
+ virtual bool IsCanvasWindow() const { return true; }
+#endif
- // calls layout for layout constraints and sizers
- void OnSize(wxSizeEvent& event);
WX_DECLARE_CONTROL_CONTAINER();
void Init();
private:
- DECLARE_DYNAMIC_CLASS(wxPanel)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
DECLARE_EVENT_TABLE()
};