Fix for VA 4.0

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index ffde79e48ec009de2ae34a64574c529281086194..de9db536e2401932db52527f2a5d0339b8306ebe 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -6,26 +6,26 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // 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__
 #pragma interface "panelg.h"
 #endif
 
 #include "wx/window.h"
 
 #ifdef __GNUG__
 #pragma interface "panelg.h"
 #endif
 
 #include "wx/window.h"

+#include "wx/button.h"

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

-

 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
     wxPanel() { Init(); }
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
     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,


@@ -37,7 +37,7 @@ public:
 
         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,


@@ -46,6 +46,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);
     }
 


@@ -55,7 +57,7 @@ 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();
     // Sends an OnInitDialog event, which in turns transfers data to
     // to the dialog via validators.
     virtual void InitDialog();


@@ -69,23 +71,32 @@ public:
 
         // 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);
         // 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);
 
         // 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);
+
+        // overridden to tab move focus into first focusable child
+    virtual void SetFocus();
+

         // called by wxWindow whenever it gets focus
         // called by wxWindow whenever it gets focus

-    void SetLastFocus(long focus) { m_lastFocus = focus; }
-    long GetLastFocus() const { return m_lastFocus; }
+    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+    wxWindow *GetLastFocus() const { return m_winLastFocused; }

 
 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
     // the child which had the focus last time this panel was activated

-    long m_lastFocus;
+    wxWindow *m_winLastFocused;

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


@@ -96,4 +107,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_