X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27dc7e21d9bc78c7c0c991eb9c0c0350278d163d..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/generic/panelg.h?ds=sidebyside

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index c5442a15e0..b6bc8cb2a4 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,26 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
+// 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"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "panelg.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// headers and forward declarations
+// ----------------------------------------------------------------------------
+
 #include "wx/window.h"
-#include "wx/button.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
 {
 public:
@@ -40,7 +50,7 @@ public:
 
     // Constructor
     wxPanel(wxWindow *parent,
-            wxWindowID id = -1,
+            wxWindowID winid = -1,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
@@ -48,23 +58,17 @@ public:
     {
         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,
                 const wxString& name = wxPanelNameStr);
 
-    // Sends an OnInitDialog event, which in turns transfers data to
-    // to the dialog via validators.
-    virtual void InitDialog();
-
-    // a default button is activated when Enter is pressed
-    wxButton *GetDefaultItem() const { return m_btnDefault; }
-    void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; }
+    virtual ~wxPanel();
 
     // implementation from now on
     // --------------------------
@@ -72,32 +76,26 @@ public:
         // responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
-        // process a keyboard navigation message (Tab traversal)
-    void OnNavigationKey(wxNavigationKeyEvent& event);
+        // calls layout for layout constraints and sizers
+    void OnSize(wxSizeEvent& event);
 
-        // set the focus to the first child if we get it
-    void OnFocus(wxFocusEvent& event);
+    virtual void InitDialog();
 
-    void OnSize(wxSizeEvent& event);
+#ifdef __WXUNIVERSAL__
+    virtual bool IsCanvasWindow() const { return TRUE; }
+    virtual bool ProvidesBackground() const { return TRUE; }
+#endif
 
-        // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+    WX_DECLARE_CONTROL_CONTAINER();
 
 protected:
     // common part of all ctors
     void Init();
 
-    // the child which had the focus last time this panel was activated
-    wxWindow *m_winLastFocused;
-
-    // a default button or NULL
-    wxButton *m_btnDefault;
-
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)
     DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_