remove the drag-and-drop compatibility hack for extracting the embedded size of the...

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 245bb7acd8e4195c4c5a2aeb094966f13b78e5b4..1241f98b12cbd7e31e274a4b87e70a365a2b815e 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -14,18 +14,30 @@
 #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"
+    #include "wx/containr.h"
+    #include "wx/toplevel.h"
+#endif
+

 #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, wxControl)
+
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
+END_EVENT_TABLE()
+

 
 static int nextPopUpMenuId = 1000 ;
 
 MenuHandle NewUniqueMenu()
 {
 
 static int nextPopUpMenuId = 1000 ;
 
 MenuHandle NewUniqueMenu()
 {

-    MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+    MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );

     nextPopUpMenuId++ ;
 
     return handle ;
     nextPopUpMenuId++ ;
 
     return handle ;


@@ -47,7 +59,6 @@ static const int    TEXTFOCUSBORDER = 3 ;
 static const wxCoord MARGIN = 2;
 static const int    TEXTFOCUSBORDER = 0 ;
 #endif
 static const wxCoord MARGIN = 2;
 static const int    TEXTFOCUSBORDER = 0 ;
 #endif

-static const int    POPUPHEIGHT = 23;

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


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

+        SetTriggerOnSetValue( false );

     }
 
 protected:
     }
 
 protected:


@@ -97,19 +109,16 @@ protected:
             // such as the clicking the default button.
             if (!m_cb->GetEventHandler()->ProcessEvent( event ))
             {
             // 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);
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);

-                   }
+                    }

                 }
 
                 return;
                 }
 
                 return;


@@ -153,7 +162,7 @@ BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
     EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
     EVT_CHAR(wxComboBoxText::OnChar)
     EVT_KEY_UP(wxComboBoxText::OnKeyUp)
     EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
     EVT_CHAR(wxComboBoxText::OnChar)
     EVT_KEY_UP(wxComboBoxText::OnKeyUp)

-    EVT_TEXT(-1, wxComboBoxText::OnText)
+    EVT_TEXT(wxID_ANY, wxComboBoxText::OnText)

 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice


@@ -210,18 +219,17 @@ protected:
 private:
     wxComboBox *m_cb;
 
 private:
     wxComboBox *m_cb;
 

+    friend class wxComboBox;
+

     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)

-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)

 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {

-    // delete client objects
-    FreeData();
-

     // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
     // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now


@@ -311,12 +319,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 );


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

+void wxComboBox::Init()
+{
+    WX_INIT_CONTROL_CONTAINER();
+}
+

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


@@ -337,10 +344,8 @@ bool wxComboBox::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name)
 {
     const wxValidator& validator,
     const wxString& name)
 {

-    wxCArrayString chs( choices );
-
-    return Create( parent, id, value, pos, size, chs.GetCount(),
-                   chs.GetStrings(), style, validator, name );
+    return Create( parent, id, value, pos, size, 0, NULL,
+                   style, validator, name );

 }
 
 bool wxComboBox::Create(wxWindow *parent,
 }
 
 bool wxComboBox::Create(wxWindow *parent,


@@ -378,13 +383,10 @@ bool wxComboBox::Create(wxWindow *parent,
 
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 
 
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 

-    for ( int i = 0 ; i < n ; i++ )
-    {
-        m_choice->DoAppend( choices[ i ] );
-    }
+    Append( n, choices );

 
     // Needed because it is a wxControlWithItems
 
     // Needed because it is a wxControlWithItems

-    SetBestSize(size);
+    SetInitialSize(size);

     SetStringSelection(value);
 
     return true;
     SetStringSelection(value);
 
     return true;


@@ -402,7 +404,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() ;
 }


@@ -458,94 +460,90 @@ void wxComboBox::SetEditable(bool editable)
 
 void wxComboBox::SetInsertionPoint(long pos)
 {
 
 void wxComboBox::SetInsertionPoint(long pos)
 {

-    // TODO
+    if ( m_text )
+        m_text->SetInsertionPoint(pos);

 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {

-    // TODO
+    if ( m_text )
+        m_text->SetInsertionPointEnd();

 }
 
 long wxComboBox::GetInsertionPoint() const
 {
 }
 
 long wxComboBox::GetInsertionPoint() const
 {

-    // TODO
+    if ( m_text )
+        return m_text->GetInsertionPoint();

     return 0;
 }
 
 wxTextPos wxComboBox::GetLastPosition() const
 {
     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)
 {
     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)
 {
 }
 
 void wxComboBox::Remove(long from, long to)
 {

-    // TODO
+    if ( m_text )
+        m_text->Remove(from,to);

 }
 
 void wxComboBox::SetSelection(long from, long to)
 {
 }
 
 void wxComboBox::SetSelection(long from, long to)
 {

-    // TODO
-}
-
-int wxComboBox::DoAppend(const wxString& item)
-{
-    return m_choice->DoAppend( item ) ;
-}
-
-int wxComboBox::DoInsert(const wxString& item, int pos)
-{
-    return m_choice->DoInsert( item , pos ) ;
-}
-
-void wxComboBox::DoSetItemClientData(int n, void* clientData)
-{
-    return m_choice->DoSetItemClientData( n , clientData ) ;
-}
-
-void* wxComboBox::DoGetItemClientData(int n) const
-{
-    return m_choice->DoGetItemClientData( n ) ;
-}
+    if ( m_text )
+        m_text->SetSelection(from,to);
+}
+
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData,
+                              wxClientDataType type)
+{
+    // wxItemContainer should probably be doing it itself but usually this is
+    // not necessary as the derived class DoInsertItems() calls
+    // AssignNewItemClientData() which initializes m_clientDataItemsType
+    // correctly; however as we just forward everything to wxChoice, we need to
+    // do it ourselves
+    //
+    // also notice that we never use wxClientData_Object with wxChoice as we
+    // don't want it to delete the data -- we will
+    int rc = m_choice->DoInsertItems(items, pos, clientData,
+                                     clientData ? wxClientData_Void
+                                                : wxClientData_None) ;
+    if ( rc != wxNOT_FOUND )
+    {
+        if ( !HasClientData() && type != wxClientData_None )
+            m_clientDataItemsType = type;
+    }

 
 

-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
-{
-    return m_choice->DoSetItemClientObject( n , clientData ) ;
+    return rc;

 }
 
 }
 

-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-    return m_choice->DoGetItemClientObject( n ) ;
+    return m_choice->SetClientData( n , clientData ) ;

 }
 
 }
 

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

 {
 {

-    if ( HasClientObjectData() )
-    {
-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            SetClientObject( n, NULL );
-        }
-    }
+    return m_choice->GetClientData( n ) ;

 }
 
 }
 

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

 {
 {

-    // force client object deletion
-    if( HasClientObjectData() )
-        SetClientObject( n, NULL );

     m_choice->Delete( n );
 }
 
     m_choice->Delete( n );
 }
 

-void wxComboBox::Clear()
+void wxComboBox::DoClear()

 {
 {

-    FreeData();

     m_choice->Clear();
 }
 
     m_choice->Clear();
 }
 


@@ -559,7 +557,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(n != wxNOT_FOUND ? GetString(n) : wxString(wxEmptyString));

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


@@ -567,7 +565,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 );
 }


@@ -575,15 +573,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


@@ -663,4 +661,4 @@ wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
     return noErr ;
 }
 
     return noErr ;
 }
 

-#endif
+#endif // wxUSE_COMBOBOX