From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 20 Jul 2006 15:31:10 +0000 (+0000)
Subject: [ 1523907 ] Remove unnecessary wxComboCtrl window style.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/21d6b09b108dd8f4710cf260ee9f344b6bbad704

[ 1523907 ] Remove unnecessary wxComboCtrl window style.


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

diff --git a/docs/latex/wx/comboctrl.tex b/docs/latex/wx/comboctrl.tex
index 1506f07e2e..15f4631548 100644
--- a/docs/latex/wx/comboctrl.tex
+++ b/docs/latex/wx/comboctrl.tex
@@ -145,9 +145,6 @@ dialog controls). Windows only.}
 to popup's OnComboDoubleClick. Actual behaviour is defined by a derived
 class. For instance, wxOwnerDrawnComboBox will cycle an item. This style only
 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
 more like a standard push button.}
 \end{twocollist}
diff --git a/include/wx/combo.h b/include/wx/combo.h
index 2c7b1b7faf..36d9a720e2 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -58,12 +58,8 @@ enum
     // In wxOwnerDrawnComboBox, for instance, it cycles item.
     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.
-    wxCC_STD_BUTTON                 = 0x0400
+    wxCC_STD_BUTTON                 = 0x0200
 };
 
 
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 07ab83c061..b9792d8df8 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -492,19 +492,7 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
              ( 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
             event.Skip();