compile bug fix

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index c5442a15e0ecb1c75ca58217968eb64c1f76258d..eda2bd5abdd4366377b98f716329019f5bd00ae4 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,26 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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/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:


@@ -78,8 +87,12 @@ 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; }


@@ -88,6 +101,9 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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;
 


@@ -99,5 +115,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

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

 #endif
 #endif

-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_