]> git.saurik.com Git - wxWidgets.git/commitdiff
signed/unsigned comparison warning (and probably even error) fixed
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 2 Sep 2002 12:39:16 +0000 (12:39 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 2 Sep 2002 12:39:16 +0000 (12:39 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/choice.cpp

index 41af85d6a400685d793e7db25b9237580dbf3891..f57a180cac5f8c8bcfd48db768e8f0f6f9ea7ce5 100644 (file)
@@ -200,13 +200,22 @@ void wxChoice::SetString(int n, const wxString& s)
 
 wxString wxChoice::GetString(int n) const
 {
-    size_t len = (size_t)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0);
+    int len = (int)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0);
+
     wxString str;
-    if (len != CB_ERR && len > 0) {
-        if ( ::SendMessage(GetHwnd(), CB_GETLBTEXT, n,
-                           (LPARAM)str.GetWriteBuf(len)) == CB_ERR ) {
+    if ( len != CB_ERR && len > 0 )
+    {
+        if ( ::SendMessage
+               (
+                GetHwnd(),
+                CB_GETLBTEXT,
+                n,
+                (LPARAM)(wxChar *)wxStringBuffer(str, len)
+               ) == CB_ERR )
+        {
             wxLogLastError(wxT("SendMessage(CB_GETLBTEXT)"));
         }
+
         str.UngetWriteBuf();
     }