X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/generic/panelg.h?ds=sidebyside

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 89b117992c..be02bf70e2 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,69 +1,95 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        panelg.h
-// Purpose:     wxPanel: similar to wxWindows but is coloured as for a dialog
+// Name:        wx/generic/panelg.h
+// Purpose:     wxPanel: a container for child controls
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:   	wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PANELH_G__
-#define __PANELH_G__
+#ifndef _WX_GENERIC_PANEL_H_
+#define _WX_GENERIC_PANEL_H_
 
-#ifdef __GNUG__
-#pragma interface "panelg.h"
-#endif
+// ----------------------------------------------------------------------------
+// headers and forward declarations
+// ----------------------------------------------------------------------------
 
 #include "wx/window.h"
+#include "wx/containr.h"
+
+class WXDLLEXPORT wxControlContainer;
+
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 
-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
+// ----------------------------------------------------------------------------
+// wxPanel contains other controls and implements TAB traversal between them
+// ----------------------------------------------------------------------------
 
-// Dialog boxes
-class WXDLLEXPORT wxPanel: public wxWindow
+class WXDLLEXPORT wxPanel : public wxWindow
 {
-  DECLARE_DYNAMIC_CLASS(wxPanel)
 public:
+    wxPanel() { Init(); }
+
+    // Old-style constructor (no default values for coordinates to avoid
+    // ambiguity with the new one)
+    wxPanel(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+
+    // Constructor
+    wxPanel(wxWindow *parent,
+            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, winid, pos, size, style, name);
+    }
+
+    // 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);
+
+    virtual ~wxPanel();
+
+    // implementation from now on
+    // --------------------------
+
+        // calls layout for layout constraints and sizers
+    void OnSize(wxSizeEvent& event);
+
+    virtual void InitDialog();
+
+#ifdef __WXUNIVERSAL__
+    virtual bool IsCanvasWindow() const { return true; }
+#endif
+
+
+    WX_DECLARE_CONTROL_CONTAINER();
+
+protected:
+    // common part of all ctors
+    void Init();
 
-  wxPanel(void);
-
-  // Old-style constructor
-  inline wxPanel(wxWindow *parent,
-           const int x = -1, const int y= -1, const int width = 500, const int height = 500,
-           const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
-  {
-      Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
-  }
-
-  // Constructor
-  inline wxPanel(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
-  {
-      Create(parent, id, pos, size, style, name);
-  }
-
-  bool Create(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr);
-
-  void OnPaint(wxPaintEvent& event);
-
-  // Sends an OnInitDialog event, which in turns transfers data to
-  // to the dialog via validators.
-  virtual void InitDialog(void);
-
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_