Restore a use case that was lost with the last set of updates, using a

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

diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp
index 16612c1f81cd63c74dde5a22743214e81c189a3b..2879e2a3eb5920b3190e79c170f9b896c53ba865 100644 (file)
--- a/src/mac/classic/combobox.cpp
+++ b/src/mac/classic/combobox.cpp
@@ -9,9 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/combobox.h"
-#include "wx/button.h"
-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+    #include "wx/menu.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
@@ -88,14 +94,10 @@ protected:
                 // This will invoke the dialog default action, such
                 // as the clicking the default button.
 
-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                    parent = parent->GetParent() ;
-                }
-                if ( parent && parent->GetDefaultItem() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
                 {
-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
@@ -134,7 +136,7 @@ public:
 protected:
     void OnChoice( wxCommandEvent& e )
     {
-        wxString    s = e.GetString();
+        wxString s = e.GetString();
 
         m_cb->DelegateChoice( s );
         wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
@@ -308,7 +310,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
 wxString wxComboBox::GetValue() const
 {
-    wxString        result;
+    wxString result;
 
     if ( m_text == NULL )
     {
@@ -420,27 +422,27 @@ int wxComboBox::DoAppend(const wxString& item)
     return m_choice->DoAppend( item ) ;
 }
 
-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
 {
     return m_choice->DoInsert( item , pos ) ;
 }
 
-void wxComboBox::DoSetItemClientData(int n, void* clientData)
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
     return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 
-void* wxComboBox::DoGetItemClientData(int n) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {
     return m_choice->DoGetItemClientData( n ) ;
 }
 
-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
-    return m_choice->DoSetItemClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject(n , clientData);
 }
 
-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
 {
     return m_choice->DoGetItemClientObject( n ) ;
 }
@@ -449,15 +451,15 @@ void wxComboBox::FreeData()
 {
     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 );
         }
     }
 }
 
-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)
 {
     // force client object deletion
     if( HasClientObjectData() )
@@ -482,7 +484,7 @@ void wxComboBox::SetSelection(int n)
 
     if ( m_text != NULL )
     {
-        m_text->SetValue( GetString( n ) );
+        m_text->SetValue(GetString(n));
     }
 }
 
@@ -491,7 +493,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase ) const
     return m_choice->FindString( s , bCase );
 }
 
-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const
 {
     return m_choice->GetString( n );
 }
@@ -499,15 +501,16 @@ wxString wxComboBox::GetString(int n) const
 wxString wxComboBox::GetStringSelection() const
 {
     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;
 }
 
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
-    m_choice->SetString( n , s ) ;
+    m_choice->SetString( n , s );
 }
 
 bool wxComboBox::IsEditable() const