I've put live into Vadim's wxNavigationKeyEvent idea

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

include/wx/generic/listctrl.h

@@ -624,6 +624,8 @@ class wxListCtrl: public wxControl
         else return wxColour(); }
     bool PopupMenu( wxMenu *menu, int x, int y )
       { return m_mainWin->PopupMenu( menu, x, y ); }
+    void SetFocus()
+      { m_mainWin->SetFocus(); }
 
   // implementation
 

include/wx/generic/panelg.h

@@ -20,7 +20,7 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 
-// Dialog boxes
+
 class WXDLLEXPORT wxPanel: public wxWindow
 {
 public:
@@ -56,17 +56,12 @@ public:
   // to the dialog via validators.
   virtual void InitDialog();
 
-  // overriden base class virtuals
-  virtual void SetFocus();
-
-  // callbacks
     // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
+  
     // Process a keyboard navigation message (Tab traversal)
   void OnNavigationKey(wxNavigationKeyEvent& event);
   
-protected:
-  bool SetFocusToNextChild(wxNode *nodeCurrent = (wxNode *) NULL, bool bForward = TRUE);
 
 DECLARE_DYNAMIC_CLASS(wxPanel)
 DECLARE_EVENT_TABLE()

include/wx/gtk/control.h

@@ -7,7 +7,6 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
@@ -46,10 +45,11 @@ public:
     // char (the one immediately after '&') into m_chAccel (@@ not yet)
   virtual void SetLabel( const wxString &label );
   virtual wxString GetLabel() const;
-
+  
 protected:
   wxString   m_label;
   char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
+  
 };
 
 #endif // __GTKCONTROLH__

include/wx/gtk/notebook.h

@@ -146,7 +146,7 @@ public:
     // don't delete it yourself). If bSelect, this page becomes active.
   bool AddPage(wxWindow *pPage,
                const wxString& strText,
-               bool bSelect = FALSE,
+               bool select = FALSE,
                int imageId = -1);
     // @@@@ VZ: I don't know how to implement InsertPage()
 

include/wx/gtk/radiobox.h

@@ -80,6 +80,7 @@ class wxRadioBox: public wxControl
     void SetNumberOfRowsOrCols( int n );
     
     void OnSize( wxSizeEvent &event );
+    void SetFocus();
     
   // implementation    
     

include/wx/gtk/window.h

@@ -88,6 +88,16 @@ private:
     wxString  m_data;
 };
 
+//-----------------------------------------------------------------------------
+// (debug)
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+void debug_focus_in( GtkWidget* widget, const char* name, const char* window );
+
+#endif
+
 //-----------------------------------------------------------------------------
 // wxWindow
 //-----------------------------------------------------------------------------
@@ -151,9 +161,11 @@ public:
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   inline bool Enabled() const { return IsEnabled(); }
-  virtual void SetFocus();
   virtual bool OnClose();
 
+  virtual void SetFocus();
+  static wxWindow *FindFocus();
+  
   virtual void AddChild( wxWindow *child );
   wxList& GetChildren() { return m_children; }
 
@@ -331,6 +343,7 @@ public:
   GdkGC               *m_scrollGC;
   GtkStyle            *m_widgetStyle;
   bool                 m_isStaticBox;
+  bool                 m_acceptsFocus;
 
   wxInsertChildFunction  m_insertCallback;
 

include/wx/gtk1/control.h

@@ -7,7 +7,6 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
@@ -46,10 +45,11 @@ public:
     // char (the one immediately after '&') into m_chAccel (@@ not yet)
   virtual void SetLabel( const wxString &label );
   virtual wxString GetLabel() const;
-
+  
 protected:
   wxString   m_label;
   char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
+  
 };
 
 #endif // __GTKCONTROLH__

include/wx/gtk1/notebook.h

@@ -146,7 +146,7 @@ public:
     // don't delete it yourself). If bSelect, this page becomes active.
   bool AddPage(wxWindow *pPage,
                const wxString& strText,
-               bool bSelect = FALSE,
+               bool select = FALSE,
                int imageId = -1);
     // @@@@ VZ: I don't know how to implement InsertPage()
 

include/wx/gtk1/radiobox.h

@@ -80,6 +80,7 @@ class wxRadioBox: public wxControl
     void SetNumberOfRowsOrCols( int n );
     
     void OnSize( wxSizeEvent &event );
+    void SetFocus();
     
   // implementation    
     

include/wx/gtk1/window.h

@@ -88,6 +88,16 @@ private:
     wxString  m_data;
 };
 
+//-----------------------------------------------------------------------------
+// (debug)
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+void debug_focus_in( GtkWidget* widget, const char* name, const char* window );
+
+#endif
+
 //-----------------------------------------------------------------------------
 // wxWindow
 //-----------------------------------------------------------------------------
@@ -151,9 +161,11 @@ public:
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   inline bool Enabled() const { return IsEnabled(); }
-  virtual void SetFocus();
   virtual bool OnClose();
 
+  virtual void SetFocus();
+  static wxWindow *FindFocus();
+  
   virtual void AddChild( wxWindow *child );
   wxList& GetChildren() { return m_children; }
 
@@ -331,6 +343,7 @@ public:
   GdkGC               *m_scrollGC;
   GtkStyle            *m_widgetStyle;
   bool                 m_isStaticBox;
+  bool                 m_acceptsFocus;
 
   wxInsertChildFunction  m_insertCallback;