respect wxUSE_WIZARDDLG setting

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index b6c550a860659e50100886a5580646e6206758e4..44ea182c1c639a4fc23fbffc9a44480f5205f78d 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -13,14 +13,23 @@
 #define _WX_GENERIC_PANEL_H_
 
 #ifdef __GNUG__
 #define _WX_GENERIC_PANEL_H_
 
 #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/button.h"
+
+class WXDLLEXPORT wxButton;

 
 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:


@@ -62,9 +71,11 @@ public:
     // to the dialog via validators.
     virtual void InitDialog();
 
     // to the dialog via validators.
     virtual void InitDialog();
 

+#if wxUSE_BUTTON

     // a default button is activated when Enter is pressed
     wxButton *GetDefaultItem() const { return m_btnDefault; }
     void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; }
     // a default button is activated when Enter is pressed
     wxButton *GetDefaultItem() const { return m_btnDefault; }
     void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; }

+#endif // wxUSE_BUTTON

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -78,26 +89,40 @@ public:
         // set the focus to the first child if we get it
     void OnFocus(wxFocusEvent& event);
 
         // set the focus to the first child if we get it
     void OnFocus(wxFocusEvent& event);
 

+        // calls layout for layout constraints and sizers

     void OnSize(wxSizeEvent& event);
 
     void OnSize(wxSizeEvent& event);
 

+        // overridden to tab move focus into first focusable child
+    virtual void SetFocus();
+

         // called by wxWindow whenever it gets focus
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
         // called by wxWindow whenever it gets focus
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 

+    virtual void RemoveChild(wxWindowBase *child);
+

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

+    // set the focus to the child which had it the last time
+    bool SetFocusToChild();
+

     // the child which had the focus last time this panel was activated
     wxWindow *m_winLastFocused;
 
     // the child which had the focus last time this panel was activated
     wxWindow *m_winLastFocused;
 

+#if wxUSE_BUTTON

     // a default button or NULL
     wxButton *m_btnDefault;
     // a default button or NULL
     wxButton *m_btnDefault;

+#endif // wxUSE_BUTTON

 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)
     DECLARE_EVENT_TABLE()
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)
     DECLARE_EVENT_TABLE()
 };
 

+// this function is for wxWindows use only
+extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
+

 #endif
     // _WX_GENERIC_PANEL_H_
 #endif
     // _WX_GENERIC_PANEL_H_