Make wxPASSWORD and wxPROCESS_ENTER really deprecated.

[wxWidgets.git] / src / mac / carbon / combobxc.cpp

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 5e88864db49af78d3c1c171d097fb99c95f337a4..21d3953922e88ac0ddcbece6e24d0f348fa4d90a 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/mac/carbon/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "combobox.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/combobox.h"
@@ -25,9 +21,7 @@
 #endif
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 
@@ -165,7 +159,7 @@ protected:
                         event.SetEventObject(def);
                         def->Command(event);
                         return ;
-                   }
+                    }
                 }
 
                 return;
@@ -219,7 +213,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
@@ -275,13 +269,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     {
         // we might not be fully constructed yet, therefore watch out...
         if ( m_choice )
-            m_choice->SetSize(0, 0 , width, -1);
+            m_choice->SetSize(0, 0 , width, wxDefaultCoord);
     }
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
         m_text->SetSize(0, 0, wText, height);
-        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, wxDefaultCoord);
     }
 #endif
 }
@@ -419,7 +413,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     else
     {
         m_text = new wxComboBoxText(this);
-        if ( size.y == -1 ) {
+        if ( size.y == wxDefaultCoord ) {
           csize.y = m_text->GetSize().y ;
         }
     }
@@ -567,7 +561,7 @@ int wxComboBox::DoAppend(const wxString& item)
 #endif
 }
 
-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
 {
 #if USE_HICOMBOBOX
     HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );
@@ -580,7 +574,7 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
 #endif
 }
 
-void wxComboBox::DoSetItemClientData(int n, void* clientData)
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
 #if USE_HICOMBOBOX
     return; //TODO
@@ -589,7 +583,7 @@ void wxComboBox::DoSetItemClientData(int n, void* clientData)
 #endif
 }
 
-void* wxComboBox::DoGetItemClientData(int n) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {
 #if USE_HICOMBOBOX
     return NULL; //TODO
@@ -598,7 +592,7 @@ void* wxComboBox::DoGetItemClientData(int n) const
 #endif
 }
 
-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
 #if USE_HICOMBOBOX
     return; //TODO
@@ -607,7 +601,7 @@ void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
 #endif
 }
 
-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
 {
 #if USE_HICOMBOBOX
     return NULL;
@@ -618,25 +612,25 @@ wxClientData* wxComboBox::DoGetItemClientObject(int n) const
 
 void wxComboBox::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++ )
         {
             SetClientObject( n, NULL );
         }
     }
 }
 
-int wxComboBox::GetCount() const {
+unsigned int wxComboBox::GetCount() const {
 #if USE_HICOMBOBOX
-    return (int) HIComboBoxGetItemCount( *m_peer );
+    return (unsigned int) HIComboBoxGetItemCount( *m_peer );
 #else
     return m_choice->GetCount() ;
 #endif
 }
 
-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)
 {
 #if USE_HICOMBOBOX
     HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex)n );
@@ -678,26 +672,26 @@ void wxComboBox::SetSelection(int n)
 
     if ( m_text != NULL )
     {
-        m_text->SetValue( GetString( n ) );
+        m_text->SetValue(GetString(n));
     }
 #endif
 }
 
-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase) const
 {
 #if USE_HICOMBOBOX
-    for( int i = 0 ; i < GetCount() ; i++ )
+    for( unsigned int i = 0 ; i < GetCount() ; i++ )
     {
-        if ( GetString( i ).IsSameAs(s, false) )
+        if (GetString(i).IsSameAs(s, bCase) )
             return i ;
     }
     return wxNOT_FOUND ;
 #else
-    return m_choice->FindString( s );
+    return m_choice->FindString( s, bCase );
 #endif
 }
 
-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const
 {
 #if USE_HICOMBOBOX
     CFStringRef itemText;
@@ -714,14 +708,14 @@ wxString wxComboBox::GetStringSelection() const
     return wxMacCFStringHolder(m_peer->GetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString() ;
 #else
     int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
+    if (sel != wxNOT_FOUND)
+        return wxString(this->GetString((unsigned int)sel));
     else
         return wxEmptyString;
 #endif
 }
 
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
 #if USE_HICOMBOBOX
     verify_noerr ( HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex) n,
@@ -846,4 +840,3 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     ProcessCommand(event);
     return noErr ;
 }
-