fixing 'id' objc.h collisions, listbox rewrite

[wxWidgets.git] / include / wx / generic / panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index a6e983e0244bc427e70b45050cf0e6943db746a3..1cb6a708ec9348889c7de97bfd5986776fd107e6 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,31 +1,37 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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;
 
-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 
+// ----------------------------------------------------------------------------
+// wxPanel contains other controls and implements TAB traversal between them
+// ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
-    wxPanel();
-    
+    wxPanel() { Init(); }
+
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
     wxPanel(wxWindow *parent,
@@ -33,53 +39,56 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
+        Init();
+
+        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)
     {
-        Create(parent, id, pos, size, style, name);
+        Init();
+
+        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 ~wxPanel();
+
+    // implementation from now on
+    // --------------------------
+
+        // calls layout for layout constraints and sizers
+    void OnSize(wxSizeEvent& event);
+
     virtual void InitDialog();
 
-    // implementation
-        // responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-    
-        // process a keyboard navigation message (Tab traversal)
-    void OnNavigationKey(wxNavigationKeyEvent& event);
-    
-        // set the focus to the first child if we get it
-    void OnFocus(wxFocusEvent& event);
+#ifdef __WXUNIVERSAL__
+    virtual bool IsCanvasWindow() const { return true; }
+#endif
+
 
-        // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *focus) { m_lastFocus = focus; }
-    wxWindow* GetLastFocus() const { return m_lastFocus; }
+    WX_DECLARE_CONTROL_CONTAINER();
 
 protected:
-    // the child which had the focus last time this panel was activated
-    wxWindow *m_lastFocus;
+    // common part of all ctors
+    void Init();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
     DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_