dwCallback if DWORD.

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 52cf225acc167ab7d29c19a1d771fd457f6e059a..90e3f2b7c3b971a11defa7224f261172a11aba27 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_CHOICE
+#if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
@@ -138,11 +138,11 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
 {
     // initialize wxControl
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+        return false;
 
     // now create the real HWND
     if ( !MSWCreateControl(wxT("COMBOBOX"), _T(""), pos, size) )
-        return FALSE;
+        return false;
 
 
     // choice/combobox normally has "white" (depends on colour scheme, of
@@ -158,7 +158,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     // and now we may finally size the control properly (if needed)
     SetBestSize(size);
 
-    return TRUE;
+    return true;
 }
 
 bool wxChoice::Create(wxWindow *parent,
@@ -327,16 +327,32 @@ int wxChoice::FindString(const wxString& s) const
     for ( int i = 0; i < count; i++ )
     {
         // as CB_FINDSTRINGEXACT is case insensitive, be case insensitive too
-        if ( GetString(i).IsSameAs(s, FALSE) )
+        if ( GetString(i).IsSameAs(s, false) )
             return i;
     }
 
     return wxNOT_FOUND;
 #else // !Watcom
-    int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
-                               (WPARAM)-1, (LPARAM)s.c_str());
-
-    return pos == LB_ERR ? wxNOT_FOUND : pos;
+   //TODO:  Evidently some MSW versions (all?) don't like empty strings
+   //passed to SendMessage, so we have to do it ourselves in that case
+   if ( s.size() == 0 )
+   {
+     int count = GetCount();
+     for ( int i = 0; i < count; i++ )
+     {
+       if ( GetString(i).size() == 0 )
+           return i;
+     }
+
+     return wxNOT_FOUND;
+   }
+   else
+   {
+     int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
+                                (WPARAM)-1, (LPARAM)s.c_str());
+ 
+     return pos == LB_ERR ? wxNOT_FOUND : pos;
+   }
 #endif // Watcom/!Watcom
 }
 
@@ -435,7 +451,7 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 void wxChoice::UpdateVisibleHeight()
 {
     // be careful to not change the width here
-    DoSetSize(-1, -1, -1, GetSize().y, wxSIZE_USE_EXISTING);
+    DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, GetSize().y, wxSIZE_USE_EXISTING);
 }
 
 void wxChoice::DoMoveWindow(int x, int y, int width, int height)
@@ -462,7 +478,7 @@ void wxChoice::DoGetSize(int *w, int *h) const
     // total height of the control including the drop down list -- but only
     // sometimes, and normally it isn't... I have no idea about what to do with
     // this
-    wxControl::DoGetSize(w, h);    
+    wxControl::DoGetSize(w, h);
 }
 
 void wxChoice::DoSetSize(int x, int y,
@@ -474,7 +490,7 @@ void wxChoice::DoSetSize(int x, int y,
     // the height which we must pass to Windows should be the total height of
     // the control including the drop down list while the height given to us
     // is, of course, just the height of the permanently visible part of it
-    if ( height != -1 )
+    if ( height != wxDefaultCoord )
     {
         // don't make the drop down list too tall, arbitrarily limit it to 40
         // items max and also don't leave it empty
@@ -499,7 +515,7 @@ void wxChoice::DoSetSize(int x, int y,
     // if the height specified for the visible part of the control is
     // different from the current one, we need to change it separately
     // as it is not affected by normal WM_SETSIZE
-    if ( height != -1 )
+    if ( height != wxDefaultCoord )
     {
         const int delta = heightOrig - GetSize().y;
         if ( delta )
@@ -539,18 +555,37 @@ wxSize wxChoice::DoGetBestSize() const
 
 WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    if ( nMsg == WM_LBUTTONUP )
+    switch ( nMsg )
     {
-        int x = (int)LOWORD(lParam);
-        int y = (int)HIWORD(lParam);
-
-        // Ok, this is truly weird, but if a panel with a wxChoice loses the
-        // focus, then you get a *fake* WM_LBUTTONUP message with x = 65535 and
-        // y = 65535. Filter out this nonsense.
-        //
-        // VZ: I'd like to know how to reproduce this please...
-        if ( x == 65535 && y == 65535 )
-            return 0;
+        case WM_LBUTTONUP:
+            {
+                int x = (int)LOWORD(lParam);
+                int y = (int)HIWORD(lParam);
+
+                // Ok, this is truly weird, but if a panel with a wxChoice
+                // loses the focus, then you get a *fake* WM_LBUTTONUP message
+                // with x = 65535 and y = 65535. Filter out this nonsense.
+                //
+                // VZ: I'd like to know how to reproduce this please...
+                if ( x == 65535 && y == 65535 )
+                    return 0;
+            }
+            break;
+
+            // we have to handle both: one for the normal case and the other
+            // for readonly
+        case WM_CTLCOLOREDIT:
+        case WM_CTLCOLORLISTBOX:
+        case WM_CTLCOLORSTATIC:
+            {
+                WXWORD nCtlColor;
+                WXHDC hdc;
+                WXHWND hwnd;
+                UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
+
+                return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor,
+                                             nMsg, wParam, lParam);
+            }
     }
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
@@ -561,7 +596,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     if ( param != CBN_SELCHANGE)
     {
         // "selection changed" is the only event we're after
-        return FALSE;
+        return false;
     }
 
     int n = GetSelection();
@@ -578,7 +613,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         ProcessCommand(event);
     }
 
-    return TRUE;
+    return true;
 }
 
 WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
@@ -601,4 +636,4 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 
-#endif // wxUSE_CHOICE
+#endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)