1. more keyboard navigation fixes - seems to work now

2. wxPanel now remembers the last control which had focus, so it's restored
   to it when the focus returns to the panel (very handy IMHO)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/panelg.h

@@ -24,48 +24,56 @@ WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
-  wxPanel();
+    wxPanel();
+    
+    // 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)
+    {
+        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)
+    {
+        Create(parent, id, pos, size, style, name);
+    }
 
-  // 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)
-  {
-      Create(parent, -1, wxPoint(x, y), wxSize(width, height), 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();
 
-  // 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)
-  {
-      Create(parent, id, pos, size, style, name);
-  }
+    // implementation
+        // 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);
 
-  bool Create(wxWindow *parent, wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-              const wxString& name = wxPanelNameStr);
+        // called by wxWindow whenever it gets focus
+    void SetLastFocus(wxWindow *focus) { m_lastFocus = focus; }
 
-  // Sends an OnInitDialog event, which in turns transfers data to
-  // to the dialog via validators.
-  virtual void InitDialog();
-
-    // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
-  
-    // Process a keyboard navigation message (Tab traversal)
-  void OnNavigationKey(wxNavigationKeyEvent& event);
-
-  // override base class virtuals
-    // we don't want focus for ourselves
-  virtual bool AcceptsFocus() const { return FALSE; }
+protected:
+    // the child which had the focus last time this panel was activated
+    wxWindow *m_lastFocus;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)

include/wx/msw/control.h

@@ -13,48 +13,51 @@
 #define _WX_CONTROL_H_
 
 #ifdef __GNUG__
-#pragma interface "control.h"
+    #pragma interface "control.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/list.h"
-#include "wx/validate.h"
 
 // General item class
-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl : public wxWindow
 {
-  DECLARE_ABSTRACT_CLASS(wxControl)
-public:
-   wxControl(void);
-   ~wxControl(void);
+    DECLARE_ABSTRACT_CLASS(wxControl)
+
+public:
+   wxControl();
+   virtual ~wxControl();
+
+   // Simulates an event
+   virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
+   // Calls the callback and appropriate event handlers
+   virtual void ProcessCommand(wxCommandEvent& event); 
 
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-   virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
-                                                                 // appropriate event handlers
    virtual void SetClientSize(int width, int height);
    virtual void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
 
    virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel(void) const ;
+   virtual wxString GetLabel() const;
 
 #if WXWIN_COMPATIBILITY
-   inline virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   inline wxColour*GetButtonColour(void) const { return NULL; }
+   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
+   wxColour* GetButtonColour() const { return NULL; }
 
    inline virtual void SetLabelFont(const wxFont& font);
    inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont& GetLabelFont(void) const ;
-   inline wxFont& GetButtonFont(void) const ;
+   inline wxFont& GetLabelFont() const;
+   inline wxFont& GetButtonFont() const;
 #endif
 
    // Places item in centre of panel - so can't be used BEFORE panel->Fit()
    void Centre(int direction = wxHORIZONTAL);
-   inline void Callback(const wxFunction function);           // Adds callback
+
+   // Adds callback
+   inline void Callback(const wxFunction function);
 
    // MSW-specific
    
    // Window procedure
-   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
    virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
    virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
 
@@ -64,24 +67,30 @@ public:
    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
-   inline wxFunction GetCallback(void) { return m_callback; }
-   inline wxList& GetSubcontrols(void) { return m_subControls; }
+   wxFunction GetCallback() { return m_callback; }
+   wxList& GetSubcontrols() { return m_subControls; }
+
 protected:
    wxFunction       m_callback;     // Callback associated with the window
  
    // MSW implementation
    wxList           m_subControls; // For controls like radiobuttons which are really composite
 
-DECLARE_EVENT_TABLE()
+private:
+   DECLARE_EVENT_TABLE()
 };
 
-inline void wxControl::Callback(const wxFunction function) { m_callback = function; };           // Adds callback
+// Adds callback
+inline void wxControl::Callback(const wxFunction function)
+{
+    m_callback = function;
+};
 
 #if WXWIN_COMPATIBILITY
-inline wxFont& wxControl::GetLabelFont(void) const         { return GetFont() ; }
-inline wxFont& wxControl::GetButtonFont(void) const        { return GetFont() ; }
-inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
-inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
+    inline wxFont& wxControl::GetLabelFont() const { return GetFont() ; }
+    inline wxFont& wxControl::GetButtonFont() const { return GetFont() ; }
+    inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
+    inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif
 
 #endif