Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed selection handling and added default/cancel handling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-08-23 14:17:28 +00:00
parent 4dcf0afed7
commit 9210422353
2 changed files with 124 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/mac/carbon/listbox.cpp
View File

@@ -842,13 +842,51 @@ static long sLastTypeIn = 0 ;
void wxListBox::OnChar(wxKeyEvent& event) void wxListBox::OnChar(wxKeyEvent& event)
{ {
EventRecord *ev = (EventRecord*) (wxTheApp->MacGetCurrentEvent() ) ; if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
short keycode ; {
short keychar ; wxWindow* parent = GetParent() ;
keychar = short(ev->message & charCodeMask); while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
keycode = short(ev->message & keyCodeMask) >> 8 ; parent = parent->GetParent() ;
if ( event.KeyCode() == WXK_SPACE )
if ( parent && parent->GetDefaultItem() )
{
wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
wxButton);
if ( def && def->IsEnabled() )
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
event.SetEventObject(def);
def->Command(event);
return ;
}
}
event.Skip() ;
}
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (event.KeyCode() == WXK_ESCAPE || (event.KeyCode() == '.' && event.MetaDown() ) )
{
wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( new_event );
}
else if ( event.KeyCode() == WXK_TAB )
{
wxNavigationKeyEvent new_event;
new_event.SetEventObject( this );
new_event.SetDirection( !event.ShiftDown() );
/* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
new_event.SetWindowChange( event.ControlDown() );
new_event.SetCurrentFocus( this );
if ( !GetEventHandler()->ProcessEvent( new_event ) )
event.Skip() ;
}
else if ( event.KeyCode() == WXK_SPACE || event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
{ {
// perform the default key handling first
if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
wxControl::OnKeyDown( event ) ;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this ); event.SetEventObject( this );
@@ -871,25 +909,34 @@ void wxListBox::OnChar(wxKeyEvent& event)
event.m_commandInt = n; event.m_commandInt = n;
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
}
else if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
{
// default handling
event.Skip() ;
// ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
} }
else else
{ {
if ( ev->when > m_lastTypeIn + 60 ) if ( event.GetTimestamp() > m_lastTypeIn + 60 )
{ {
m_typeIn = "" ; m_typeIn = "" ;
} }
m_lastTypeIn = ev->when ; m_lastTypeIn = event.GetTimestamp() ;
m_typeIn += (char) event.KeyCode() ; m_typeIn += (char) event.KeyCode() ;
int line = FindString("*"+m_typeIn+"*") ; int line = FindString("*"+m_typeIn+"*") ;
if ( line >= 0 ) if ( line >= 0 )
{ {
SetSelection(line) ; if ( GetSelection() != line )
{
SetSelection(line) ;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
if ( HasClientObjectData() )
event.SetClientObject( GetClientObject( line ) );
else if ( HasClientUntypedData() )
event.SetClientData( GetClientData(line) );
event.SetString( GetString(line) );
event.m_commandInt = line ;
GetEventHandler()->ProcessEvent(event);
}
} }
} }
} }

77
src/mac/listbox.cpp
View File

@@ -842,13 +842,51 @@ static long sLastTypeIn = 0 ;
void wxListBox::OnChar(wxKeyEvent& event) void wxListBox::OnChar(wxKeyEvent& event)
{ {
EventRecord *ev = (EventRecord*) (wxTheApp->MacGetCurrentEvent() ) ; if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
short keycode ; {
short keychar ; wxWindow* parent = GetParent() ;
keychar = short(ev->message & charCodeMask); while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
keycode = short(ev->message & keyCodeMask) >> 8 ; parent = parent->GetParent() ;
if ( event.KeyCode() == WXK_SPACE )
if ( parent && parent->GetDefaultItem() )
{
wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
wxButton);
if ( def && def->IsEnabled() )
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
event.SetEventObject(def);
def->Command(event);
return ;
}
}
event.Skip() ;
}
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (event.KeyCode() == WXK_ESCAPE || (event.KeyCode() == '.' && event.MetaDown() ) )
{
wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( new_event );
}
else if ( event.KeyCode() == WXK_TAB )
{
wxNavigationKeyEvent new_event;
new_event.SetEventObject( this );
new_event.SetDirection( !event.ShiftDown() );
/* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
new_event.SetWindowChange( event.ControlDown() );
new_event.SetCurrentFocus( this );
if ( !GetEventHandler()->ProcessEvent( new_event ) )
event.Skip() ;
}
else if ( event.KeyCode() == WXK_SPACE || event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
{ {
// perform the default key handling first
if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
wxControl::OnKeyDown( event ) ;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this ); event.SetEventObject( this );
@@ -871,25 +909,34 @@ void wxListBox::OnChar(wxKeyEvent& event)
event.m_commandInt = n; event.m_commandInt = n;
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
}
else if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
{
// default handling
event.Skip() ;
// ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
} }
else else
{ {
if ( ev->when > m_lastTypeIn + 60 ) if ( event.GetTimestamp() > m_lastTypeIn + 60 )
{ {
m_typeIn = "" ; m_typeIn = "" ;
} }
m_lastTypeIn = ev->when ; m_lastTypeIn = event.GetTimestamp() ;
m_typeIn += (char) event.KeyCode() ; m_typeIn += (char) event.KeyCode() ;
int line = FindString("*"+m_typeIn+"*") ; int line = FindString("*"+m_typeIn+"*") ;
if ( line >= 0 ) if ( line >= 0 )
{ {
SetSelection(line) ; if ( GetSelection() != line )
{
SetSelection(line) ;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
if ( HasClientObjectData() )
event.SetClientObject( GetClientObject( line ) );
else if ( HasClientUntypedData() )
event.SetClientData( GetClientData(line) );
event.SetString( GetString(line) );
event.m_commandInt = line ;
GetEventHandler()->ProcessEvent(event);
}
} }
} }
} }