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

[ 1523907 ] Remove unnecessary wxComboCtrl window style.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-07-20 15:31:10 +00:00
parent da44b91efc
commit 21d6b09b10
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/latex/wx/comboctrl.tex
View File

@@ -145,9 +145,6 @@ dialog controls). Windows only.}
to popup's OnComboDoubleClick. Actual behaviour is defined by a derived to popup's OnComboDoubleClick. Actual behaviour is defined by a derived
class. For instance, wxOwnerDrawnComboBox will cycle an item. This style only class. For instance, wxOwnerDrawnComboBox will cycle an item. This style only
applies if wxCB\_READONLY is used as well.} applies if wxCB\_READONLY is used as well.}
\twocolitem{\windowstyle{wxCC\_ALT\_KEYS}}{Use keyboard behaviour alternate
to platform default: up and down keys will show popup (instead of cycling value,
for instance, on wxMSW).}
\twocolitem{\windowstyle{wxCC\_STD\_BUTTON}}{Drop button will behave \twocolitem{\windowstyle{wxCC\_STD\_BUTTON}}{Drop button will behave
more like a standard push button.} more like a standard push button.}
\end{twocollist} \end{twocollist}

6
include/wx/combo.h
View File

@@ -58,12 +58,8 @@ enum
// In wxOwnerDrawnComboBox, for instance, it cycles item. // In wxOwnerDrawnComboBox, for instance, it cycles item.
wxCC_SPECIAL_DCLICK = 0x0100, wxCC_SPECIAL_DCLICK = 0x0100,
// Use keyboard behaviour alternate to platform default:
// Up an down keys will show popup instead of cycling value.
wxCC_ALT_KEYS = 0x0200,
// Dropbutton acts like standard push button. // Dropbutton acts like standard push button.
wxCC_STD_BUTTON = 0x0400 wxCC_STD_BUTTON = 0x0200
}; };

12
src/common/combocmn.cpp
View File

@@ -492,18 +492,6 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
( keycode != WXK_RIGHT && keycode != WXK_LEFT ) ( keycode != WXK_RIGHT && keycode != WXK_LEFT )
) )
{ {
// Alternate keys: UP and DOWN show the popup instead of cycling
if ( (comboStyle & wxCC_ALT_KEYS) )
{
if ( keycode == WXK_UP || keycode == WXK_DOWN )
{
m_combo->OnButtonClick();
return;
}
else
event.Skip();
}
else
popupInterface->OnComboKeyEvent(event); popupInterface->OnComboKeyEvent(event);
} }
else else