Fixed uninstalled toolbars in native toolbar mode, with a method for

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 331103395af5ca0de612572cfbbb7f7243873ff4..eaf09763e2fc61e85e69cd1fc87e95414886e52a 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -19,13 +19,14 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/containr.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
@@ -36,7 +37,7 @@ static int nextPopUpMenuId = 1000 ;
 
 MenuHandle NewUniqueMenu()
 {
-    MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+    MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
     nextPopUpMenuId++ ;
 
     return handle ;
@@ -58,7 +59,6 @@ static const int    TEXTFOCUSBORDER = 3 ;
 static const wxCoord MARGIN = 2;
 static const int    TEXTFOCUSBORDER = 0 ;
 #endif
-static const int    POPUPHEIGHT = 23;
 
 
 // ----------------------------------------------------------------------------
@@ -109,19 +109,16 @@ protected:
             // such as the clicking the default button.
             if (!m_cb->GetEventHandler()->ProcessEvent( event ))
             {
-                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() );
                         event.SetEventObject(def);
                         def->Command(event);
-                   }
+                    }
                 }
 
                 return;
@@ -337,7 +334,7 @@ void wxComboBox::DelegateChoice( const wxString& value )
 
 void wxComboBox::Init()
 {
-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();
 }
 
 bool wxComboBox::Create(wxWindow *parent,
@@ -397,7 +394,7 @@ bool wxComboBox::Create(wxWindow *parent,
     }
 
     // Needed because it is a wxControlWithItems
-    SetBestSize(size);
+    SetInitialSize(size);
     SetStringSelection(value);
 
     return true;
@@ -471,39 +468,46 @@ void wxComboBox::SetEditable(bool editable)
 
 void wxComboBox::SetInsertionPoint(long pos)
 {
-    // TODO
+    if ( m_text )
+        m_text->SetInsertionPoint(pos);
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
-    // TODO
+    if ( m_text )
+        m_text->SetInsertionPointEnd();
 }
 
 long wxComboBox::GetInsertionPoint() const
 {
-    // TODO
+    if ( m_text )
+        return m_text->GetInsertionPoint();
     return 0;
 }
 
 wxTextPos wxComboBox::GetLastPosition() const
 {
-    // TODO
+    if ( m_text )
+        return m_text->GetLastPosition();
     return 0;
 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
-    // TODO
+    if ( m_text )
+        m_text->Replace(from,to,value);
 }
 
 void wxComboBox::Remove(long from, long to)
 {
-    // TODO
+    if ( m_text )
+        m_text->Remove(from,to);
 }
 
 void wxComboBox::SetSelection(long from, long to)
 {
-    // TODO
+    if ( m_text )
+        m_text->SetSelection(from,to);
 }
 
 int wxComboBox::DoAppend(const wxString& item)
@@ -572,7 +576,7 @@ void wxComboBox::SetSelection(int n)
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
-        m_text->SetValue(GetString(n));
+        m_text->SetValue(n != wxNOT_FOUND ? GetString(n) : wxString(wxEmptyString));
 }
 
 int wxComboBox::FindString(const wxString& s, bool bCase) const