Fixed test for button style - styles contain other style bits

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index b7feab4c5bc490b52e47349a177a2a6abfbf6aac..c8681252f84f74f24bdc8a9dc3075d13067cc0be 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -141,7 +141,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
         return false;
 
     // now create the real HWND
         return false;
 
     // now create the real HWND

-    if ( !MSWCreateControl(wxT("COMBOBOX"), _T(""), pos, size) )
+    if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )

         return false;
 
 
         return false;
 
 


@@ -335,12 +335,12 @@ int wxChoice::FindString(const wxString& s) const
 #else // !Watcom
    //TODO:  Evidently some MSW versions (all?) don't like empty strings
    //passed to SendMessage, so we have to do it ourselves in that case
 #else // !Watcom
    //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 )
+   if ( s.empty() )

    {
      int count = GetCount();
      for ( int i = 0; i < count; i++ )
      {
    {
      int count = GetCount();
      for ( int i = 0; i < count; i++ )
      {

-       if ( GetString(i).size() == 0 )
+       if ( GetString(i).empty() )

            return i;
      }
 
            return i;
      }
 


@@ -350,7 +350,7 @@ int wxChoice::FindString(const wxString& s) const
    {
      int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
                                 (WPARAM)-1, (LPARAM)s.c_str());
    {
      int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
                                 (WPARAM)-1, (LPARAM)s.c_str());

- 
+

      return pos == LB_ERR ? wxNOT_FOUND : pos;
    }
 #endif // Watcom/!Watcom
      return pos == LB_ERR ? wxNOT_FOUND : pos;
    }
 #endif // Watcom/!Watcom


@@ -507,10 +507,10 @@ void wxChoice::DoSetSize(int x, int y,
     else
     {
         // We cannot pass wxDefaultCoord as height to wxControl. wxControl uses
     else
     {
         // We cannot pass wxDefaultCoord as height to wxControl. wxControl uses

-        // wxGetWindowRect() to determine the current height of the combobox, 
-        // and then again sets the combobox's height to that value. Unfortunately, 
-        // wxGetWindowRect doesn't include the dropdown list's height (at least 
-        // on Win2K), so this would result in a combobox with dropdown height of 
+        // wxGetWindowRect() to determine the current height of the combobox,
+        // and then again sets the combobox's height to that value. Unfortunately,
+        // wxGetWindowRect doesn't include the dropdown list's height (at least
+        // on Win2K), so this would result in a combobox with dropdown height of

         // 1 pixel. We have to determine the default height ourselves and call
         // wxControl with that value instead.
         int w, h;
         // 1 pixel. We have to determine the default height ourselves and call
         // wxControl with that value instead.
         int w, h;


@@ -518,7 +518,7 @@ void wxChoice::DoSetSize(int x, int y,
         DoGetSize(&w, &h);
         if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)
         {
         DoGetSize(&w, &h);
         if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)
         {

-            height = h + r.bottom - r.top;       
+            height = h + r.bottom - r.top;

         }
     }
 
         }
     }
 


@@ -599,7 +599,7 @@ WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 WXHWND hwnd;
                 UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
 
                 WXHWND hwnd;
                 UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
 

-                WXHBRUSH hbr = MSWControlColor((WXHDC)hdc);
+                WXHBRUSH hbr = MSWControlColor((WXHDC)hdc, hwnd);

                 if ( hbr )
                     return (WXLRESULT)hbr;
                 //else: fall through to default window proc
                 if ( hbr )
                     return (WXLRESULT)hbr;
                 //else: fall through to default window proc


@@ -634,12 +634,12 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     return true;
 }
 
     return true;
 }
 

-WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC)
+WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC, WXHWND hWnd)

 {
     if ( !IsEnabled() )
         return MSWControlColorDisabled(hDC);
 
 {
     if ( !IsEnabled() )
         return MSWControlColorDisabled(hDC);
 

-    return wxChoiceBase::MSWControlColorSolid(hDC);
+    return wxChoiceBase::MSWControlColor(hDC, hWnd);

 }
 
 #endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)
 }
 
 #endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)