Fixed ISO-8859-11 mapping to code page under Windows

[wxWidgets.git] / src / msw / wince / choicece.cpp

diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp
index edadc5f8e423bc232d03503b954c3644e9cf5804..caef2a0388fe1e5f8209192a34b0100324ea9a5b 100644 (file)
--- a/src/msw/wince/choicece.cpp
+++ b/src/msw/wince/choicece.cpp
@@ -24,17 +24,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CHOICE && defined(__SMARTPHONE__) && defined(__WXWINCE__)
+
+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

 #endif
 
 #endif
 

-#include "wx/spinbutt.h" // for wxSpinnerBestSize
-
-#include <commctrl.h>
-#include "wx/msw/missing.h"
-#include "wx/msw/winundef.h"
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 

-#if wxUSE_CHOICE && defined(__SMARTPHONE__) && defined(__WXWINCE__)
+#include "wx/spinbutt.h" // for wxSpinnerBestSize

 
 #if wxUSE_EXTENDED_RTTI
 // TODO
 
 #if wxUSE_EXTENDED_RTTI
 // TODO


@@ -223,7 +223,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     if ( style & wxSP_WRAP )
         spiner_style |= UDS_WRAP;
 
     if ( style & wxSP_WRAP )
         spiner_style |= UDS_WRAP;
 

-    if ( !MSWCreateControl(UPDOWN_CLASS, spiner_style, posBtn, sizeBtn, _T(""), 0) )
+    if ( !MSWCreateControl(UPDOWN_CLASS, spiner_style, posBtn, sizeBtn, wxEmptyString, 0) )

         return false;
 
     // subclass the text ctrl to be able to intercept some events
         return false;
 
     // subclass the text ctrl to be able to intercept some events


@@ -346,10 +346,10 @@ 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 choice"));
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into choice"));

-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));

 
     int n = (int)::SendMessage(GetBuddyHwnd(), LB_INSERTSTRING, pos, (LPARAM)item.c_str());
     if ( n == LB_ERR )
 
     int n = (int)::SendMessage(GetBuddyHwnd(), LB_INSERTSTRING, pos, (LPARAM)item.c_str());
     if ( n == LB_ERR )


@@ -360,9 +360,9 @@ 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( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );

 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -383,8 +383,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);
         }


@@ -409,22 +409,26 @@ void wxChoice::SetSelection(int n)
 // string list functions
 // ----------------------------------------------------------------------------
 
 // string list functions
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    return (int)::SendMessage(GetBuddyHwnd(), LB_GETCOUNT, 0, 0);
+    return (unsigned int)::SendMessage(GetBuddyHwnd(), LB_GETCOUNT, 0, 0);

 }
 
 }
 

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

 {
 {

+    // back to base class search for not native search type
+    if (bCase)
+       return wxItemContainerImmutable::FindString( s, bCase );
+

     int pos = (int)::SendMessage(GetBuddyHwnd(), LB_FINDSTRINGEXACT,
                                (WPARAM)-1, (LPARAM)s.c_str());
 
     return pos == LB_ERR ? wxNOT_FOUND : pos;
 }
 
     int pos = (int)::SendMessage(GetBuddyHwnd(), LB_FINDSTRINGEXACT,
                                (WPARAM)-1, (LPARAM)s.c_str());
 
     return pos == LB_ERR ? wxNOT_FOUND : pos;
 }
 

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

 {
 {

-    wxCHECK_RET( n >= 0 && n < GetCount(),
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid item index in wxChoice::SetString") );
 
     // we have to delete and add back the string as there is no way to change a
                  wxT("invalid item index in wxChoice::SetString") );
 
     // we have to delete and add back the string as there is no way to change a


@@ -451,7 +455,7 @@ void wxChoice::SetString(int n, const wxString& s)
     //else: it's already NULL by default
 }
 
     //else: it's already NULL by default
 }
 

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

 {
     int len = (int)::SendMessage(GetBuddyHwnd(), LB_GETTEXTLEN, n, 0);
 
 {
     int len = (int)::SendMessage(GetBuddyHwnd(), LB_GETTEXTLEN, n, 0);
 


@@ -477,7 +481,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(), LB_SETITEMDATA,
                        n, (LPARAM)clientData) == LB_ERR )
 {
     if ( ::SendMessage(GetHwnd(), LB_SETITEMDATA,
                        n, (LPARAM)clientData) == LB_ERR )


@@ -486,7 +490,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(), LB_GETITEMDATA, n, 0);
     if ( rc == LB_ERR )
 {
     LPARAM rc = ::SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
     if ( rc == LB_ERR )


@@ -500,12 +504,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);
 }