use wxIsNullDouble instead of comparing m_ration with 0

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 0bd353a41a2f97b46c25dda003092f66e326b33b..50681b9440f0be2af8fc69da7261d4455d4cb110 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "combobox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -174,6 +170,9 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:

+        case WM_SYSCHAR:
+        case WM_SYSKEYDOWN:
+        case WM_SYSKEYUP:

         case WM_SETFOCUS:
         case WM_KILLFOCUS:
             {
         case WM_SETFOCUS:
         case WM_KILLFOCUS:
             {


@@ -241,18 +240,41 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 
 WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-    // handle WM_CTLCOLOR messages from our EDIT control to be able to set its
-    // colour correctly (to be the same as our own one)
+    // TODO: handle WM_CTLCOLOR messages from our EDIT control to be able to
+    //       set its colour correctly (to be the same as our own one)
+

     switch ( nMsg )
     {
         case CB_SETCURSEL:
             // Selection was set with SetSelection.  Update the value too.
             if ((int)wParam > GetCount())
     switch ( nMsg )
     {
         case CB_SETCURSEL:
             // Selection was set with SetSelection.  Update the value too.
             if ((int)wParam > GetCount())

-                m_value = wxEmptyString;
+                m_value.clear();

             else
                 m_value = GetString(wParam);
             m_selectionOld = -1;
             break;
             else
                 m_value = GetString(wParam);
             m_selectionOld = -1;
             break;

+
+        case WM_SIZE:
+        // wxStaticBox can generate this message, when modifying the control's style.
+        // This causes the content of the combobox to be selected, for some reason.
+        case WM_STYLECHANGED:
+            {
+                // combobox selection sometimes spontaneously changes when its
+                // size changes, restore it to the old value if necessary
+                long fromOld, toOld;
+                GetSelection(&fromOld, &toOld);
+                WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+
+                long fromNew, toNew;
+                GetSelection(&fromNew, &toNew);
+
+                if ( fromOld != fromNew || toOld != toNew )
+                {
+                    SetSelection(fromOld, toOld);
+                }
+
+                return result;
+            }

     }
 
     return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
     }
 
     return wxChoice::MSWWindowProc(nMsg, wParam, lParam);


@@ -279,12 +301,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
                     return true;
                 }
             }
                     return true;
                 }
             }

+            // fall through

 
 

+        case WM_SYSCHAR:

             return HandleChar(wParam, lParam, true /* isASCII */);
 
             return HandleChar(wParam, lParam, true /* isASCII */);
 

+        case WM_SYSKEYDOWN:

         case WM_KEYDOWN:
             return HandleKeyDown(wParam, lParam);
 
         case WM_KEYDOWN:
             return HandleKeyDown(wParam, lParam);
 

+        case WM_SYSKEYUP:

         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);
 
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);
 


@@ -298,17 +324,19 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
     return false;
 }
 
     return false;
 }
 

-bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)

 {
     wxString value;
     int sel = -1;
     switch ( param )
     {
 {
     wxString value;
     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;


@@ -366,10 +394,14 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
                 ProcessCommand(event);
             }
             break;
                 ProcessCommand(event);
             }
             break;

+
+        default:
+            return wxChoice::MSWCommand(param, id);

     }
 
     }
 

-    // there is no return value for the CBN_ notifications, so always return
-    // false from here to pass the message to DefWindowProc()
+    // let the def window proc have it by returning false, but do not pass the
+    // message we've already handled here (notably CBN_SELCHANGE) to the base
+    // class as it would generate another event for them

     return false;
 }
 
     return false;
 }
 


@@ -456,6 +488,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;
 


@@ -476,29 +513,6 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
     return msStyle;
 }
 

-// ----------------------------------------------------------------------------
-// wxComboBox geometry
-// ----------------------------------------------------------------------------
-
-void
-wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // work around a Windows bug (search for "Bug in Windows Combobox" in
-    // Google Groups): resizing the combobox changes the selection in it
-    long fromOld, toOld;
-    GetSelection(&fromOld, &toOld);
-
-    wxChoice::DoSetSize(x, y, width, height, sizeFlags);
-
-    long fromNew, toNew;
-    GetSelection(&fromNew, &toNew);
-
-    if ( fromOld != fromNew || toOld != toNew )
-    {
-        SetSelection(fromOld, toOld);
-    }
-}
-

 // ----------------------------------------------------------------------------
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------


@@ -560,7 +574,7 @@ bool wxComboBox::CanUndo() const
 {
     if (!IsEditable())
         return false;
 {
     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;


@@ -572,7 +586,7 @@ bool wxComboBox::CanRedo() const
 {
     if (!IsEditable())
         return false;
 {
     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;


@@ -656,11 +670,10 @@ void wxComboBox::SetInsertionPointEnd()
 
 long wxComboBox::GetInsertionPoint() const
 {
 
 long wxComboBox::GetInsertionPoint() const
 {

-    // CB_GETEDITSEL returns the index of the last character after selection in
-    // its high-order word
+    // CB_GETEDITSEL returns the index of the first character of the selection in
+    // its low-order word

     DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
     DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);

-
-    return HIWORD(pos);
+    return LOWORD(pos);

 }
 
 wxTextPos wxComboBox::GetLastPosition() const
 }
 
 wxTextPos wxComboBox::GetLastPosition() const


@@ -684,6 +697,10 @@ void wxComboBox::Replace(long from, long to, const wxString& value)
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);

+#else
+    wxUnusedVar(from);
+    wxUnusedVar(to);
+    wxUnusedVar(value);

 #endif
 }
 
 #endif
 }