security fix to wxSingleInstanceChecker: check if the lock file was really created...

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 830e8564a77c5e1a1895c39b4366c3b6f0c278b4..f158ee702e41278547ba0f162dee22f7a2e779bd 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -40,7 +40,11 @@ MenuHandle NewUniqueMenu()
 
 // the margin between the text control and the choice
 static const wxCoord MARGIN = 2;
+#if TARGET_API_MAC_OSX
+static const int    POPUPWIDTH = 24;
+#else
 static const int    POPUPWIDTH = 18;
+#endif
 static const int    POPUPHEIGHT = 23;
 
 
@@ -55,6 +59,9 @@ public:
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
+
+        // remove the default minsize, the combobox will have one instead
+        SetSizeHints(-1,-1);
     }
 
 protected:
@@ -135,6 +142,9 @@ public:
         : wxChoice( cb , 1 )
     {
         m_cb = cb;
+
+        // remove the default minsize, the combobox will have one instead
+        SetSizeHints(-1,-1);
     }
 
 protected:
@@ -149,6 +159,13 @@ protected:
         event2.SetString(m_cb->GetStringSelection());
         m_cb->ProcessCommand(event2);
     }
+    virtual wxSize DoGetBestSize() const
+    {
+        wxSize sz = wxChoice::DoGetBestSize() ;
+        if (! m_cb->HasFlag(wxCB_READONLY) )
+            sz.x = POPUPWIDTH;
+        return sz ;
+    }  
 
 private:
     wxComboBox *m_cb;
@@ -162,7 +179,10 @@ END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
-   // delete the controls now, don't leave them alive even though they would
+    // 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
     if (m_text != NULL) {
@@ -201,7 +221,9 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 
     if ( m_text == NULL )
     {
-        m_choice->SetSize(0, 0 , width, -1);
+        // we might not be fully constructed yet, therefore watch out...
+        if ( m_choice )
+            m_choice->SetSize(0, 0 , width, -1);
     }
     else
     {
@@ -253,6 +275,22 @@ void wxComboBox::DelegateChoice( const wxString& value )
 }
 
 
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    wxCArrayString chs( choices );
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
+
+
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
@@ -269,7 +307,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     m_choice = new wxComboBoxChoice(this, style );
-
+    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
@@ -290,6 +328,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
+    SetBestSize(csize);   // Needed because it is a wxControlWithItems
+
     return TRUE;
 }
 
@@ -309,6 +349,11 @@ wxString wxComboBox::GetValue() const
     return result;
 }
 
+int wxComboBox::GetCount() const
+{ 
+    return m_choice->GetCount() ; 
+}
+
 void wxComboBox::SetValue(const wxString& value)
 {
     int s = FindString (value);
@@ -414,31 +459,47 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
 
 void wxComboBox::DoSetItemClientData(int n, void* clientData) 
 {
-    return m_choice->SetClientData( n , clientData ) ;
+    return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 
 void* wxComboBox::DoGetItemClientData(int n) const
 {
-    return m_choice->GetClientData( n ) ;
+    return m_choice->DoGetItemClientData( n ) ;
 }
 
 void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
 {
-    return m_choice->SetClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject( n , clientData ) ;
 }
 
 wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
 {
-    return m_choice->GetClientObject( n ) ;
+    return m_choice->DoGetItemClientObject( n ) ;
+}
+
+void wxComboBox::FreeData()
+{
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetClientObject( n, NULL );
+        }
+    }
 }
 
 void wxComboBox::Delete(int n)
 {
+    // force client object deletion
+    if( HasClientObjectData() )
+        SetClientObject( n, NULL );
     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {
+    FreeData();
     m_choice->Clear();
 }
 
@@ -494,12 +555,13 @@ void wxComboBox::SetString(int n, const wxString& s)
 }
 
 
-void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) 
+wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
+    return noErr ;
 }