Made widgets sample take up less space

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index a4c8029462a6a56e5d66c93839f3e57e92cd9a91..076011ac792eff8a6ccf36e350114cfa19d56eb4 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,31 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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)
 // 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__
 
 #ifdef __GNUG__

-#pragma interface "panelg.h"
+    #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;

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 

+// ----------------------------------------------------------------------------
+// wxPanel contains other controls and implements TAB traversal between them
+// ----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
 
 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,
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
     wxPanel(wxWindow *parent,


@@ -33,9 +43,11 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {

+        Init();
+

         Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
     }
         Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
     }

-    
+

     // Constructor
     wxPanel(wxWindow *parent,
             wxWindowID id = -1,
     // Constructor
     wxPanel(wxWindow *parent,
             wxWindowID id = -1,


@@ -44,6 +56,8 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {

+        Init();
+

         Create(parent, id, pos, size, style, name);
     }
 
         Create(parent, id, pos, size, style, name);
     }
 


@@ -53,28 +67,25 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
                 const wxString& name = wxPanelNameStr);
                 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();

 
 

-    // implementation
+    virtual ~wxPanel();
+
+    // implementation from now on
+    // --------------------------
+

         // responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
         // 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);

 
 

-        // called by wxWindow whenever it gets focus
-    void SetLastFocus(long focus) { m_lastFocus = focus; }
-    long GetLastFocus() const { return m_lastFocus; }
+        // calls layout for layout constraints and sizers
+    void OnSize(wxSizeEvent& event);
+
+    virtual void InitDialog();
+
+    WX_DECLARE_CONTROL_CONTAINER();

 
 protected:
 
 protected:

-    // the child which had the focus last time this panel was activated
-    long m_lastFocus;
+    // common part of all ctors
+    void Init();

 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)


@@ -82,4 +93,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_