Include wx/slider.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index c1e6fb31db19136448e9629165556bd1f002c3e2..80cc353d68e1a53b49b23bf77ce1baefdaee01a8 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -26,8 +26,9 @@
 
 #if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 
 #if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"


@@ -236,7 +237,7 @@ int wxChoice::DoAppend(const wxString& item)
     return n;
 }
 
     return n;
 }
 

-int wxChoice::DoInsert(const wxString& item, int pos)
+int wxChoice::DoInsert(const wxString& item, unsigned int pos)

 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
     wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
     wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));


@@ -256,7 +257,7 @@ int wxChoice::DoInsert(const wxString& item, int pos)
     return n;
 }
 
     return n;
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::Delete(unsigned int n)

 {
     wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
 
 {
     wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
 


@@ -289,8 +290,8 @@ void wxChoice::Free()
 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {

-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )

         {
             delete GetClientObject(n);
         }
         {
             delete GetClientObject(n);
         }


@@ -326,9 +327,9 @@ void wxChoice::SetSelection(int n)
 // string list functions
 // ----------------------------------------------------------------------------
 
 // string list functions
 // ----------------------------------------------------------------------------
 

-size_t wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
 {

-    return (size_t)SendMessage(GetHwnd(), CB_GETCOUNT, 0, 0);
+    return (unsigned int)SendMessage(GetHwnd(), CB_GETCOUNT, 0, 0);

 }
 
 int wxChoice::FindString(const wxString& s, bool bCase) const
 }
 
 int wxChoice::FindString(const wxString& s, bool bCase) const


@@ -336,11 +337,11 @@ int wxChoice::FindString(const wxString& s, bool bCase) const
 #if defined(__WATCOMC__) && defined(__WIN386__)
     // For some reason, Watcom in WIN386 mode crashes in the CB_FINDSTRINGEXACT message.
     // wxChoice::Do it the long way instead.
 #if defined(__WATCOMC__) && defined(__WIN386__)
     // For some reason, Watcom in WIN386 mode crashes in the CB_FINDSTRINGEXACT message.
     // wxChoice::Do it the long way instead.

-    size_t count = GetCount();
-    for ( size_t i = 0; i < count; i++ )
+    unsigned int count = GetCount();
+    for ( unsigned int i = 0; i < count; i++ )

     {
         // as CB_FINDSTRINGEXACT is case insensitive, be case insensitive too
     {
         // as CB_FINDSTRINGEXACT is case insensitive, be case insensitive too

-        if ( GetString(i).IsSameAs(s, bCase) )
+        if (GetString(i).IsSameAs(s, bCase))

             return i;
     }
 
             return i;
     }
 


@@ -350,10 +351,10 @@ int wxChoice::FindString(const wxString& s, bool bCase) const
    //passed to SendMessage, so we have to do it ourselves in that case
    if ( s.empty() )
    {
    //passed to SendMessage, so we have to do it ourselves in that case
    if ( s.empty() )
    {

-       size_t count = GetCount();
-       for ( size_t i = 0; i < count; i++ )
+       unsigned int count = GetCount();
+       for ( unsigned int i = 0; i < count; i++ )

        {
        {

-         if ( GetString(i).empty() )
+         if (GetString(i).empty())

              return i;
        }
 
              return i;
        }
 


@@ -374,7 +375,7 @@ int wxChoice::FindString(const wxString& s, bool bCase) const
 #endif // Watcom/!Watcom
 }
 
 #endif // Watcom/!Watcom
 }
 

-void wxChoice::SetString(int n, const wxString& s)
+void wxChoice::SetString(unsigned int n, const wxString& s)

 {
     wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::SetString") );
 
 {
     wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::SetString") );
 


@@ -404,7 +405,7 @@ void wxChoice::SetString(int n, const wxString& s)
     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }
 

-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned int n) const

 {
     int len = (int)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0);
 
 {
     int len = (int)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0);
 


@@ -430,7 +431,7 @@ wxString wxChoice::GetString(int n) const
 // client data
 // ----------------------------------------------------------------------------
 
 // client data
 // ----------------------------------------------------------------------------
 

-void wxChoice::DoSetItemClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
     if ( ::SendMessage(GetHwnd(), CB_SETITEMDATA,
                        n, (LPARAM)clientData) == CB_ERR )
 {
     if ( ::SendMessage(GetHwnd(), CB_SETITEMDATA,
                        n, (LPARAM)clientData) == CB_ERR )


@@ -439,7 +440,7 @@ void wxChoice::DoSetItemClientData( int n, void* clientData )
     }
 }
 
     }
 }
 

-void* wxChoice::DoGetItemClientData( int n ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
     LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
     if ( rc == CB_ERR )
 {
     LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
     if ( rc == CB_ERR )


@@ -453,12 +454,12 @@ void* wxChoice::DoGetItemClientData( int n ) const
     return (void *)rc;
 }
 
     return (void *)rc;
 }
 

-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
     DoSetItemClientData(n, clientData);
 }
 
 {
     DoSetItemClientData(n, clientData);
 }
 

-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const

 {
     return (wxClientData *)DoGetItemClientData(n);
 }
 {
     return (wxClientData *)DoGetItemClientData(n);
 }


@@ -504,35 +505,22 @@ void wxChoice::DoSetSize(int x, int y,
                          int width, int height,
                          int sizeFlags)
 {
                          int width, int height,
                          int sizeFlags)
 {

-    int heightOrig = height;
-

     // 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 != wxDefaultCoord )
     {
     // 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 != wxDefaultCoord )
     {

-        int w, h;
-        DoGetSize(&w, &h);
-        
-        // Don't change the height if it's already this size
-        if (h == height)
-        {
-            height = -1;
-        }
-        else
-        {
-            // don't make the drop down list too tall, arbitrarily limit it to 40
-            // items max and also don't leave it empty
-            size_t nItems = GetCount();
-            if ( !nItems )
-                nItems = 9;
-            else if ( nItems > 24 )
-                nItems = 24;
-            
-            // add space for the drop down list
-            const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
-            height += hItem*(nItems + 1);
-        }
+        // don't make the drop down list too tall, arbitrarily limit it to 40
+        // items max and also don't leave it empty
+        size_t nItems = GetCount();
+        if ( !nItems )
+            nItems = 9;
+        else if ( nItems > 24 )
+            nItems = 24;
+
+        // add space for the drop down list
+        const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
+        height += hItem*(nItems + 1);

     }
     else
     {
     }
     else
     {


@@ -546,7 +534,7 @@ void wxChoice::DoSetSize(int x, int y,
         int w, h;
         RECT r;
         DoGetSize(&w, &h);
         int w, h;
         RECT r;
         DoGetSize(&w, &h);

-        if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0 && r.bottom < 30000)
+        if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)

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


@@ -554,25 +542,71 @@ void wxChoice::DoSetSize(int x, int y,
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
 
 
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
 

-    // I'm commenting this out since the code appears to make choices
-    // and comboxes too high when they have associated sizers. I'm sure this
-    // is not the end of the story, which is why I'm leaving it #if'ed out for
-    // now. JACS.
+    // This solution works on XP, but causes choice/combobox lists to be
+    // too short on W2K and earlier.

 #if 0
 #if 0

-    // 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 != wxDefaultCoord )
+    int widthCurrent, heightCurrent;
+    DoGetSize(&widthCurrent, &heightCurrent);
+
+    // 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 != wxDefaultCoord && height != heightCurrent )
+    {
+        // don't make the drop down list too tall, arbitrarily limit it to 40
+        // items max and also don't leave it empty
+        unsigned int nItems = GetCount();
+        if ( !nItems )
+            nItems = 9;
+        else if ( nItems > 24 )
+            nItems = 24;
+
+        // add space for the drop down list
+        const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
+        height += hItem*(nItems + 1);
+    }
+    else // keep the same height as now

     {
     {

-        const int delta = heightOrig - GetSize().y;
-        if ( delta )
+        // normally wxWindow::DoSetSize() checks if we set the same size as the
+        // window already has and does nothing in this case, but for us the
+        // check fails as the size we pass to it includes the dropdown while
+        // the size returned by our GetSize() does not, so test if the size
+        // didn't really change ourselves here
+        if ( width == wxDefaultCoord || width == widthCurrent )

         {
         {

-            int h = ::SendMessage(GetHwnd(), CB_GETITEMHEIGHT, (WPARAM)-1, 0);
-            SendMessage(GetHwnd(), CB_SETITEMHEIGHT, (WPARAM)-1, h + delta);
+            // size doesn't change, what about position?
+            int xCurrent, yCurrent;
+            DoGetPosition(&xCurrent, &yCurrent);
+            const bool defMeansUnchanged = !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE);
+            if ( ((x == wxDefaultCoord && defMeansUnchanged) || x == xCurrent)
+                    &&
+                 ((y == wxDefaultCoord && defMeansUnchanged) || y == yCurrent) )
+            {
+                // nothing changes, nothing to do
+                return;
+            }
+        }
+
+        // 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
+        // 1 pixel. We have to determine the default height ourselves and call
+        // wxControl with that value instead.
+        //
+        // Also notice that sometimes CB_GETDROPPEDCONTROLRECT seems to return
+        // wildly incorrect values (~32000) which looks like a bug in it, just
+        // ignore them in this case
+        RECT r;
+        if ( ::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r)
+                    && r.bottom < 30000 )
+        {
+            height = heightCurrent + r.bottom - r.top;

         }
     }
         }
     }

-#else
-    wxUnusedVar(heightOrig);
+
+    wxControl::DoSetSize(x, y, width, height, sizeFlags);

 #endif
 }
 
 #endif
 }
 


@@ -580,8 +614,8 @@ wxSize wxChoice::DoGetBestSize() const
 {
     // find the widest string
     int wChoice = 0;
 {
     // find the widest string
     int wChoice = 0;

-    const size_t nItems = GetCount();
-    for ( size_t i = 0; i < nItems; i++ )
+    const unsigned int nItems = GetCount();
+    for ( unsigned int i = 0; i < nItems; i++ )

     {
         int wLine;
         GetTextExtent(GetString(i), &wLine, NULL);
     {
         int wLine;
         GetTextExtent(GetString(i), &wLine, NULL);


@@ -708,10 +742,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
                 if ( n > -1 )
                 {
                     event.SetString(GetStringSelection());
                 if ( n > -1 )
                 {
                     event.SetString(GetStringSelection());

-                    if ( HasClientObjectData() )
-                        event.SetClientObject( GetClientObject(n) );
-                    else if ( HasClientUntypedData() )
-                        event.SetClientData( GetClientData(n) );
+                    InitCommandEventWithItems(event, n);

                 }
 
                 ProcessCommand(event);
                 }
 
                 ProcessCommand(event);