From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 9 Feb 2006 15:03:51 +0000 (+0000)
Subject: correct tabbing for full keyboard access
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1de43645160fd0686ec025112362d56da2ad77c2?ds=inline

correct tabbing for full keyboard access


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

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 2232caa777..4ad1e4846a 100644
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -27,13 +27,12 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
  public:
-    inline wxComboBox() {}
+    wxComboBox() ;
     virtual ~wxComboBox();
 
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
-    virtual void SetFocus();
 
     // callback functions
     virtual void DelegateTextChanged( const wxString& value );
@@ -125,6 +124,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
+    WX_DECLARE_CONTROL_CONTAINER();
 protected:
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
@@ -143,6 +143,8 @@ protected:
     // the subcontrols
     wxComboBoxText*     m_text;
     wxComboBoxChoice*   m_choice;
+
+    DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/include/wx/mac/carbon/spinctrl.h b/include/wx/mac/carbon/spinctrl.h
index 384e2b1d7a..5970091073 100755
--- a/include/wx/mac/carbon/spinctrl.h
+++ b/include/wx/mac/carbon/spinctrl.h
@@ -76,7 +76,6 @@ public:
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = TRUE);
     virtual bool Show(bool show = TRUE);
-    virtual void SetFocus();
 
     // get the subcontrols
     wxTextCtrl *GetText() const { return m_text; }
@@ -90,6 +89,8 @@ public:
     // number is out of range
     bool GetTextValue(int *val) const;
 
+    WX_DECLARE_CONTROL_CONTAINER();
+
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
@@ -104,6 +105,7 @@ private:
     wxSpinButton *m_btn;
     
 private:
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };