Include wx/font.h according to precompiled headers of wx/wx.h (with other minor clean...

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 71a386b3da18aaeb7b8998cf5a850657d16d0b9a..dd73be5b4c15a4276cdae35f087e6fcb0697bbc6 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -14,12 +14,23 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
 #if wxUSE_COMBOBOX
 
 #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/containr.h"

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

+WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox)
+
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
+END_EVENT_TABLE()
+

 
 static int nextPopUpMenuId = 1000 ;
 
 
 static int nextPopUpMenuId = 1000 ;
 


@@ -61,6 +72,7 @@ public:
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;

+        SetTriggerOnSetValue( false );

     }
 
 protected:
     }
 
 protected:


@@ -313,12 +325,6 @@ bool wxComboBox::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-void wxComboBox::SetFocus()
-{
-    if ( m_text != NULL)
-        m_text->SetFocus();
-}
-

 void wxComboBox::DelegateTextChanged( const wxString& value )
 {
     SetStringSelection( value );
 void wxComboBox::DelegateTextChanged( const wxString& value )
 {
     SetStringSelection( value );


@@ -329,6 +335,11 @@ void wxComboBox::DelegateChoice( const wxString& value )
     SetStringSelection( value );
 }
 
     SetStringSelection( value );
 }
 

+void wxComboBox::Init()
+{
+    m_container.SetContainerWindow(this);
+}
+

 bool wxComboBox::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& value,
 bool wxComboBox::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& value,


@@ -404,7 +415,7 @@ wxString wxComboBox::GetValue() const
     return result;
 }
 
     return result;
 }
 

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

 {
     return m_choice->GetCount() ;
 }
 {
     return m_choice->GetCount() ;
 }


@@ -500,27 +511,27 @@ int wxComboBox::DoAppend(const wxString& item)
     return m_choice->DoAppend( 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 ) ;
 }
 
 {
     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 ) ;
 }
 
 {
     return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 

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

 {
     return m_choice->DoGetItemClientData( n ) ;
 }
 
 {
     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 ) ;
 }
 {
     return m_choice->DoGetItemClientObject( n ) ;
 }


@@ -529,15 +540,15 @@ 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 );
         }
     }
 }
 
         {
             SetClientObject( n, NULL );
         }
     }
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)

 {
     // force client object deletion
     if( HasClientObjectData() )
 {
     // force client object deletion
     if( HasClientObjectData() )


@@ -561,7 +572,7 @@ void wxComboBox::SetSelection(int n)
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )

-        m_text->SetValue( GetString( n ) );
+        m_text->SetValue(GetString(n));

 }
 
 int wxComboBox::FindString(const wxString& s, bool bCase) const
 }
 
 int wxComboBox::FindString(const wxString& s, bool bCase) const


@@ -569,7 +580,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
     return m_choice->FindString( s, bCase );
 }
 
     return m_choice->FindString( s, bCase );
 }
 

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

 {
     return m_choice->GetString( n );
 }
 {
     return m_choice->GetString( n );
 }


@@ -577,15 +588,15 @@ wxString wxComboBox::GetString(int n) const
 wxString wxComboBox::GetStringSelection() const
 {
     int sel = GetSelection();
 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;
 }
 
     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
 }
 
 bool wxComboBox::IsEditable() const