AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

full keyboard access support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2006-02-09 15:45:46 +00:00
parent 98717dd512
commit 7f10ed6e65
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/combobox.cpp
View File

@ -16,10 +16,17 @@
#include "wx/combobox.h"
#include "wx/button.h"
#include "wx/menu.h"
#include "wx/containr.h"
#include "wx/mac/uma.h"
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox)
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
END_EVENT_TABLE()
static int nextPopUpMenuId = 1000 ;
@ -219,6 +226,11 @@ BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
END_EVENT_TABLE()
wxComboBox::wxComboBox()
{
m_container.SetContainerWindow(this);
}
wxComboBox::~wxComboBox()
{
// delete client objects
@ -313,12 +325,6 @@ bool wxComboBox::Show(bool show)
return true;
}
void wxComboBox::SetFocus()
{
if ( m_text != NULL)
m_text->SetFocus();
}
void wxComboBox::DelegateTextChanged( const wxString& value )
{
SetStringSelection( value );

17
src/mac/carbon/spinctrl.cpp
View File

@ -15,7 +15,7 @@
#include "wx/spinbutt.h"
#include "wx/spinctrl.h"
#include "wx/textctrl.h"
#include "wx/containr.h"
// ----------------------------------------------------------------------------
// constants
@ -138,6 +138,13 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl)
END_EVENT_TABLE()
WX_DELEGATE_TO_CONTROL_CONTAINER(wxSpinCtrl)
// ============================================================================
// implementation
// ============================================================================
@ -150,6 +157,7 @@ void wxSpinCtrl::Init()
{
m_text = NULL;
m_btn = NULL;
m_container.SetContainerWindow(this);
}
bool wxSpinCtrl::Create(wxWindow *parent,
@ -273,13 +281,6 @@ bool wxSpinCtrl::Show(bool show)
return TRUE;
}
void wxSpinCtrl::SetFocus()
{
if ( m_text != NULL) {
m_text->SetFocus();
}
}
// ----------------------------------------------------------------------------
// value and range access
// ----------------------------------------------------------------------------