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 94ac38d2877bb01f5f88effa2dabf6dc6d3c76f5..de9db536e2401932db52527f2a5d0339b8306ebe 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -6,64 +6,105 @@
 // 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 char*) wxPanelNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;

 
 

-// Dialog boxes
-class WXDLLEXPORT wxPanel: public wxWindow
+class WXDLLEXPORT wxPanel : public wxWindow

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPanel)

 public:
 public:

+    wxPanel() { Init(); }

 
 

-  wxPanel(void);
-
-  // Old-style constructor
-  inline wxPanel(wxWindow *parent,
-           int x = -1, int y= -1, int width = 500, int height = 500,
-           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,
-           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);
-
-  void OnPaint(wxPaintEvent& event);
-
-  // Sends an OnInitDialog event, which in turns transfers data to
-  // to the dialog via validators.
-  virtual void InitDialog(void);
-
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-DECLARE_EVENT_TABLE()
+    // 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, -1, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+
+    // Constructor
+    wxPanel(wxWindow *parent,
+            wxWindowID id = -1,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, style, name);
+    }
+
+    // Pseudo ctor
+    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();
+
+    // a default button is activated when Enter is pressed
+    wxButton *GetDefaultItem() const { return m_btnDefault; }
+    void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; }
+
+    // implementation from now on
+    // --------------------------
+
+        // 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);
+
+        // 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
+    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+
+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;
+
+    // a default button or NULL
+    wxButton *m_btnDefault;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif

-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_