Small fixes after wxHtmlTagHandler::GetParser() addition.

[wxWidgets.git] / src / osx / combobox_osx.cpp

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 214bdbdff4611cb5d23a4247635fc17ca8a1fd0a..00a8e571fe659f939354c47020c3096c55735317 100644 (file)
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: combobox_osx.cpp 58318 2009-01-23 08:36:16Z RR $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -21,16 +21,10 @@
 
 // work in progress
 
 
 // work in progress
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-

 wxComboBox::~wxComboBox()
 {
 }
 
 wxComboBox::~wxComboBox()
 {
 }
 

-void wxComboBox::Init()
-{
-}
-

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


@@ -55,18 +49,18 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    DontCreatePeer();
+    

     m_text = NULL;
     m_choice = NULL;
     m_text = NULL;
     m_choice = NULL;

-
-    m_macIsUserPane = false;
-
+    

     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     wxASSERT_MSG( !(style & wxCB_SORT),
                   "wxCB_SORT not currently supported by wxOSX/Cocoa");
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     wxASSERT_MSG( !(style & wxCB_SORT),
                   "wxCB_SORT not currently supported by wxOSX/Cocoa");
 

-    m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -112,7 +106,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
         AssignNewItemClientData(idx, clientData, i, type);
     }
 
         AssignNewItemClientData(idx, clientData, i, type);
     }
 

-    m_peer->SetMaximum( GetCount() );
+    GetPeer()->SetMaximum( GetCount() );

 
     return pos - 1;
 }
 
     return pos - 1;
 }


@@ -122,15 +116,11 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
 // ----------------------------------------------------------------------------
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
 // ----------------------------------------------------------------------------
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {

-    wxCHECK_RET( IsValid(n), "invalid index" );
-

     m_datas[n] = (char*)clientData ;
 }
 
 void * wxComboBox::DoGetItemClientData(unsigned int n) const
 {
     m_datas[n] = (char*)clientData ;
 }
 
 void * wxComboBox::DoGetItemClientData(unsigned int n) const
 {

-    wxCHECK_MSG( IsValid(n), NULL, "invalid index" );
-

     return (void *)m_datas[n];
 }
 
     return (void *)m_datas[n];
 }
 


@@ -141,11 +131,13 @@ unsigned int wxComboBox::GetCount() const
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {

+    m_datas.RemoveAt(n);

     GetComboPeer()->RemoveItem(n);
 }
 
 void wxComboBox::DoClear()
 {
     GetComboPeer()->RemoveItem(n);
 }
 
 void wxComboBox::DoClear()
 {

+    m_datas.Clear();

     GetComboPeer()->Clear();
 }
 
     GetComboPeer()->Clear();
 }
 


@@ -186,18 +178,24 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
 
 wxString wxComboBox::GetString(unsigned int n) const
 {
 
 wxString wxComboBox::GetString(unsigned int n) const
 {

+    wxCHECK_MSG( n < GetCount(), wxString(), "Invalid combobox index" );
+

     return GetComboPeer()->GetStringAtIndex(n);
 }
 
 wxString wxComboBox::GetStringSelection() const
 {
     return GetComboPeer()->GetStringAtIndex(n);
 }
 
 wxString wxComboBox::GetStringSelection() const
 {

-    return GetString(GetSelection());
+    const int sel = GetSelection();
+    return sel == wxNOT_FOUND ? wxString() : GetString(sel);

 }
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
 }
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {

-    Delete(n);
-    Insert(s, n);
+    // Notice that we shouldn't delete and insert the item in this control
+    // itself as this would also affect the client data which we need to
+    // preserve here.
+    GetComboPeer()->RemoveItem(n);
+    GetComboPeer()->InsertItem(n, s);

     SetValue(s); // changing the item in the list won't update the display item
 }
 
     SetValue(s); // changing the item in the list won't update the display item
 }
 


@@ -219,7 +217,17 @@ bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {
 
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {

-    return dynamic_cast<wxComboWidgetImpl*> (m_peer);
+    return dynamic_cast<wxComboWidgetImpl*> (GetPeer());
+}
+
+void wxComboBox::Popup()
+{
+    GetComboPeer()->Popup();
+}
+
+void wxComboBox::Dismiss()
+{
+    GetComboPeer()->Dismiss();

 }
 
 #endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA
 }
 
 #endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA