Compilation fix for USE_UNIV=1

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 701a0ca000cb0150f8933317de543ffebf95961c..dba4981564e37213e8dea8cbb061a3f4c26676ca 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,76 +1,98 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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$
 // 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"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "panelg.h"

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// headers and forward declarations
+// ----------------------------------------------------------------------------
+

 #include "wx/window.h"
 #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

 {
 public:
 {
 public:

-  wxPanel();
-
-  // Old-style constructor (no default values for coordinates to avoid ambiguity
-  // with the new one)
-  inline wxPanel(wxWindow *parent,
-                 int x, int y, int width, int height,
-                 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, wxWindowID id = -1,
-                 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);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-              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();
-
-  // overriden base class virtuals
-  virtual void SetFocus();
-
-  // callbacks
-    // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
-    // Process a keyboard navigation message (Tab traversal)
-  void OnNavigationKey(wxNavigationKeyEvent& event);
-  
+    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,
+                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:
 protected:

-  bool SetFocusToNextChild(wxNode *nodeCurrent = (wxNode *) NULL, bool bForward = TRUE);
+    // common part of all ctors
+    void Init();

 
 

-DECLARE_DYNAMIC_CLASS(wxPanel)
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif

-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_