should not bring to front upon focussing

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

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index cd4fc9518a11aa066932b5458d1a075d7126436c..3dc89288eef738433a799689245c74ef3e0cb240 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,25 +49,27 @@ 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 );
 
     Append(n, choices);
 
 
     MacPostControlCreate( pos, size );
 
     Append(n, choices);
 

-    // Set the first item as being selected
-    if (n > 0)
+    // Set up the initial value, by default the first item is selected.
+    if ( !value.empty() )
+        SetValue(value);
+    else if (n > 0)

         SetSelection( 0 );
 
     // Needed because it is a wxControlWithItems
         SetSelection( 0 );
 
     // Needed because it is a wxControlWithItems


@@ -110,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;
 }


@@ -120,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];
 }
 


@@ -145,7 +137,6 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
 void wxComboBox::DoClear()
 {
     GetComboPeer()->Clear();
 void wxComboBox::DoClear()
 {
     GetComboPeer()->Clear();

-    SetValue(wxEmptyString);

 }
 
 void wxComboBox::GetSelection(long *from, long *to) const
 }
 
 void wxComboBox::GetSelection(long *from, long *to) const


@@ -172,7 +163,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
 {
     if (!bCase)
     {
 {
     if (!bCase)
     {

-        for (int i = 0; i < GetCount(); i++)
+        for (unsigned i = 0; i < GetCount(); i++)

         {
             if (s.IsSameAs(GetString(i), false))
                 return i;
         {
             if (s.IsSameAs(GetString(i), false))
                 return i;


@@ -185,12 +176,15 @@ 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)


@@ -200,12 +194,13 @@ void wxComboBox::SetString(unsigned int n, const wxString& 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
 }
 

-void wxComboBox::EnableTextChangedEvents(bool enable)
+void wxComboBox::EnableTextChangedEvents(bool WXUNUSED(enable))

 {
 {

-    wxFAIL_MSG("Method Not Implemented.");
+    // nothing to do here, events are never generated when we change the
+    // control value programmatically anyhow by Cocoa

 }
 
 }
 

-bool wxComboBox::OSXHandleClicked( double timestampsec )
+bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());


@@ -215,14 +210,19 @@ bool wxComboBox::OSXHandleClicked( double timestampsec )
     return true;
 }
 
     return true;
 }
 

-wxTextWidgetImpl* wxComboBox::GetTextPeer() const
+wxComboWidgetImpl* wxComboBox::GetComboPeer() const

 {
 {

-    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
+    return dynamic_cast<wxComboWidgetImpl*> (GetPeer());

 }
 
 }
 

-wxComboWidgetImpl* wxComboBox::GetComboPeer() const
+void wxComboBox::Popup()
+{
+    GetComboPeer()->Popup();
+}
+
+void wxComboBox::Dismiss()

 {
 {

-    return dynamic_cast<wxComboWidgetImpl*> (m_peer);
+    GetComboPeer()->Dismiss();

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