Unicode compilation fixes

[wxWidgets.git] / src / mac / classic / choice.cpp

diff --git a/src/mac/classic/choice.cpp b/src/mac/classic/choice.cpp
index f3d6144b6799b4674a6b70e4978e60a570b0407d..8371e99ad975d4faf9b32139c5b7d959c2dd8f07 100644 (file)
--- a/src/mac/classic/choice.cpp
+++ b/src/mac/classic/choice.cpp
@@ -1,20 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/mac/classic/choice.cpp

 // Purpose:     wxChoice
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxChoice
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
 
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"

-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+#endif
+

 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)


@@ -25,7 +29,7 @@ wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {

-        size_t i, max = GetCount();
+        unsigned int i, max = GetCount();

 
         for ( i = 0; i < max; ++i )
             delete GetClientObject(i);
 
         for ( i = 0; i < max; ++i )
             delete GetClientObject(i);


@@ -96,10 +100,10 @@ int wxChoice::DoAppend(const wxString& item)
     return index ;
 }
 
     return index ;
 }
 

-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(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));

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

 
     if (pos == GetCount())
         return DoAppend(item);
 
     if (pos == GetCount())
         return DoAppend(item);


@@ -112,9 +116,9 @@ int wxChoice::DoInsert(const wxString& item, int pos)
     return pos ;
 }
 
     return pos ;
 }
 

-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() )
     {
         delete GetClientObject(n);
     if ( HasClientObjectData() )
     {
         delete GetClientObject(n);


@@ -128,7 +132,7 @@ void wxChoice::Delete(int n)
 void wxChoice::Clear()
 {
     FreeData();
 void wxChoice::Clear()
 {
     FreeData();

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

     {
         ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
     }
     {
         ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
     }


@@ -141,8 +145,8 @@ void wxChoice::FreeData()
 {
     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);
         }


@@ -166,22 +170,12 @@ void wxChoice::SetSelection(int n)
 // string list functions
 // ----------------------------------------------------------------------------
 
 // string list functions
 // ----------------------------------------------------------------------------
 

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

 {
     return m_strings.GetCount() ;
 }
 
 {
     return m_strings.GetCount() ;
 }
 

-int wxChoice::FindString(const wxString& s) const
-{
-    for( int i = 0 ; i < GetCount() ; i++ )
-    {
-        if ( GetString( i ).IsSameAs(s, false) )
-            return i ;
-    }
-    return wxNOT_FOUND ;
-}
-
-void wxChoice::SetString(int n, const wxString& s)
+void wxChoice::SetString(unsigned int n, const wxString& s)

 {
     wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
 #if 0 // should do this, but no Insert() so far
 {
     wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
 #if 0 // should do this, but no Insert() so far


@@ -190,9 +184,9 @@ void wxChoice::SetString(int n, const wxString& s)
 #endif
 }
 
 #endif
 }
 

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

 {
 {

-    wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""),
+    wxCHECK_MSG( IsValid(n), wxEmptyString,

                     _T("wxChoice::GetString(): invalid index") );
 
     return m_strings[n] ;
                     _T("wxChoice::GetString(): invalid index") );
 
     return m_strings[n] ;


@@ -201,27 +195,27 @@ 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)

 {
 {

-    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
+    wxCHECK_RET( n >= 0 && (unsigned int)n < m_datas.GetCount(),

                  wxT("invalid index in wxChoice::SetClientData") );
 
     m_datas[n] = (char*) clientData ;
 }
 
                  wxT("invalid index in wxChoice::SetClientData") );
 
     m_datas[n] = (char*) clientData ;
 }
 

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

 {
 {

-    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
+    wxCHECK_MSG( n >= 0 && (unsigned int)n < m_datas.GetCount(), NULL,

                  wxT("invalid index in wxChoice::GetClientData") );
     return (void *)m_datas[n];
 }
 
                  wxT("invalid index in wxChoice::GetClientData") );
     return (void *)m_datas[n];
 }
 

-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);
 }


@@ -269,7 +263,7 @@ wxSize wxChoice::DoGetBestSize() const
             ::TextFace( 0 ) ;
         }
         // Find the widest line
             ::TextFace( 0 ) ;
         }
         // Find the widest line

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

             wxString str(GetString(i));
         #if wxUSE_UNICODE
             Point bounds={0,0} ;
             wxString str(GetString(i));
         #if wxUSE_UNICODE
             Point bounds={0,0} ;


@@ -282,7 +276,7 @@ wxSize wxChoice::DoGetBestSize() const
                 &baseline );
             wLine = bounds.h ;
         #else
                 &baseline );
             wLine = bounds.h ;
         #else

-            wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+            wLine = ::TextWidth( str.c_str() , 0 , str.length() ) ;

         #endif
             lbWidth = wxMax(lbWidth, wLine);
         }
         #endif
             lbWidth = wxMax(lbWidth, wLine);
         }