correct tabbing for full keyboard access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,13 +27,12 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
|
|||||||
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
inline wxComboBox() {}
|
wxComboBox() ;
|
||||||
virtual ~wxComboBox();
|
virtual ~wxComboBox();
|
||||||
|
|
||||||
// forward these functions to all subcontrols
|
// forward these functions to all subcontrols
|
||||||
virtual bool Enable(bool enable = true);
|
virtual bool Enable(bool enable = true);
|
||||||
virtual bool Show(bool show = true);
|
virtual bool Show(bool show = true);
|
||||||
virtual void SetFocus();
|
|
||||||
|
|
||||||
// callback functions
|
// callback functions
|
||||||
virtual void DelegateTextChanged( const wxString& value );
|
virtual void DelegateTextChanged( const wxString& value );
|
||||||
@@ -125,6 +124,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
|
|||||||
|
|
||||||
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
|
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
|
||||||
|
|
||||||
|
WX_DECLARE_CONTROL_CONTAINER();
|
||||||
protected:
|
protected:
|
||||||
// override the base class virtuals involved in geometry calculations
|
// override the base class virtuals involved in geometry calculations
|
||||||
virtual wxSize DoGetBestSize() const;
|
virtual wxSize DoGetBestSize() const;
|
||||||
@@ -143,6 +143,8 @@ protected:
|
|||||||
// the subcontrols
|
// the subcontrols
|
||||||
wxComboBoxText* m_text;
|
wxComboBoxText* m_text;
|
||||||
wxComboBoxChoice* m_choice;
|
wxComboBoxChoice* m_choice;
|
||||||
|
|
||||||
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -76,7 +76,6 @@ public:
|
|||||||
// forward these functions to all subcontrols
|
// forward these functions to all subcontrols
|
||||||
virtual bool Enable(bool enable = TRUE);
|
virtual bool Enable(bool enable = TRUE);
|
||||||
virtual bool Show(bool show = TRUE);
|
virtual bool Show(bool show = TRUE);
|
||||||
virtual void SetFocus();
|
|
||||||
|
|
||||||
// get the subcontrols
|
// get the subcontrols
|
||||||
wxTextCtrl *GetText() const { return m_text; }
|
wxTextCtrl *GetText() const { return m_text; }
|
||||||
@@ -90,6 +89,8 @@ public:
|
|||||||
// number is out of range
|
// number is out of range
|
||||||
bool GetTextValue(int *val) const;
|
bool GetTextValue(int *val) const;
|
||||||
|
|
||||||
|
WX_DECLARE_CONTROL_CONTAINER();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// override the base class virtuals involved into geometry calculations
|
// override the base class virtuals involved into geometry calculations
|
||||||
virtual wxSize DoGetBestSize() const;
|
virtual wxSize DoGetBestSize() const;
|
||||||
@@ -104,6 +105,7 @@ private:
|
|||||||
wxSpinButton *m_btn;
|
wxSpinButton *m_btn;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
DECLARE_EVENT_TABLE()
|
||||||
DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
|
DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user