Warning fix.

[wxWidgets.git] / src / msw / combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 642e48329ae4dfacf27b63af69ab8f3b14be2660..38ec288a72f82c7a409a4fd29c37462b7a77ce9d 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -304,11 +304,13 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     int sel = -1;
     switch ( param )
     {
     int sel = -1;
     switch ( param )
     {

+        case CBN_SELENDOK:

         case CBN_SELCHANGE:
             sel = GetSelection();
 
         case CBN_SELCHANGE:
             sel = GetSelection();
 

-            // somehow we get 2 CBN_SELCHANGE events with the same index when
-            // the user selects an item in the combobox -- ignore duplicates
+            // we may sometimes get 2 CBN_SELCHANGE events or a CBN_SELENDOK
+            // before CBN_SELCHANGE with the same index when the user selects
+            // an item in the combobox -- ignore duplicates

             if ( sel > -1 && sel != m_selectionOld )
             {
                 m_selectionOld = sel;
             if ( sel > -1 && sel != m_selectionOld )
             {
                 m_selectionOld = sel;


@@ -456,6 +458,11 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
                       );
 
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
                       );
 

+    // usually WS_TABSTOP is added by wxControl::MSWGetStyle() but as we're
+    // created hidden (see Create() above), it is not done for us but we still
+    // want to have this style
+    msStyle |= WS_TABSTOP;
+

     // remove the style always added by wxChoice
     msStyle &= ~CBS_DROPDOWNLIST;
 
     // remove the style always added by wxChoice
     msStyle &= ~CBS_DROPDOWNLIST;
 


@@ -558,6 +565,9 @@ void wxComboBox::SelectAll()
 
 bool wxComboBox::CanUndo() const
 {
 
 bool wxComboBox::CanUndo() const
 {

+    if (!IsEditable())
+        return false;
+    

     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;


@@ -567,6 +577,9 @@ bool wxComboBox::CanUndo() const
 
 bool wxComboBox::CanRedo() const
 {
 
 bool wxComboBox::CanRedo() const
 {

+    if (!IsEditable())
+        return false;
+    

     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;


@@ -589,7 +602,7 @@ bool wxComboBox::CanCopy() const
 
 bool wxComboBox::CanCut() const
 {
 
 bool wxComboBox::CanCut() const
 {

-    return CanCopy() && IsEditable();
+    return IsEditable() && CanCopy() ;

 }
 
 bool wxComboBox::CanPaste() const
 }
 
 bool wxComboBox::CanPaste() const