If we have multiple filters in a Save dialog, don't use

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index a3de1918ca76a5980c1391c8e8ee28ca4bb16360..f158ee702e41278547ba0f162dee22f7a2e779bd 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"

+#include "wx/button.h"

 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 


@@ -39,7 +40,11 @@ MenuHandle NewUniqueMenu()
 
 // the margin between the text control and the choice
 static const wxCoord MARGIN = 2;
 
 // 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;
 static const int    POPUPWIDTH = 18;

+#endif

 static const int    POPUPHEIGHT = 23;
 
 
 static const int    POPUPHEIGHT = 23;
 
 


@@ -54,16 +59,69 @@ public:
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;

+
+        // remove the default minsize, the combobox will have one instead
+        SetSizeHints(-1,-1);

     }
 
 protected:
     }
 
 protected:

-    void OnTextChange( wxCommandEvent& event )
+    void OnChar( wxKeyEvent& event )

     {
     {

-        wxString    s = GetValue();
+        if ( event.GetKeyCode() == WXK_RETURN )
+        {
+            wxString value = GetValue();
+
+            if ( m_cb->GetCount() == 0 )
+            {
+                // make Enter generate "selected" event if there is only one item
+                // in the combobox - without it, it's impossible to select it at
+                // all!
+                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+                event.SetInt( 0 );
+                event.SetString( value );
+                event.SetEventObject( m_cb );
+                m_cb->GetEventHandler()->ProcessEvent( event );
+            }
+            else
+            {
+                // add the item to the list if it's not there yet
+                if ( m_cb->FindString(value) == wxNOT_FOUND )
+                {
+                    m_cb->Append(value);
+                    m_cb->SetStringSelection(value);
+
+                    // and generate the selected event for it
+                    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+                    event.SetInt( m_cb->GetCount() - 1 );
+                    event.SetString( value );
+                    event.SetEventObject( m_cb );
+                    m_cb->GetEventHandler()->ProcessEvent( event );
+                }
+
+                // This will invoke the dialog default action, such
+                // as the clicking the default button.
+
+                wxWindow *parent = GetParent();
+                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
+                    parent = parent->GetParent() ;
+                }
+                if ( parent && parent->GetDefaultItem() )
+                {
+                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
+                                                          wxButton);
+                    if ( def && def->IsEnabled() )
+                    {
+                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        event.SetEventObject(def);
+                        def->Command(event);
+                        return ;
+                   }
+                }
+
+                return;
+            }
+        }

         
         

-        if (!s.IsEmpty())
-            m_cb->DelegateTextChanged( s );
-

         event.Skip();
     }
 
         event.Skip();
     }
 


@@ -74,7 +132,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)

-    EVT_TEXT(-1, wxComboBoxText::OnTextChange)
+    EVT_CHAR( wxComboBoxText::OnChar)

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


@@ -84,6 +142,9 @@ public:
         : wxChoice( cb , 1 )
     {
         m_cb = cb;
         : wxChoice( cb , 1 )
     {
         m_cb = cb;

+
+        // remove the default minsize, the combobox will have one instead
+        SetSizeHints(-1,-1);

     }
 
 protected:
     }
 
 protected:


@@ -92,7 +153,19 @@ protected:
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );

+        wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+        event2.SetInt(m_cb->GetSelection());
+        event2.SetEventObject(m_cb);
+        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;
 
 private:
     wxComboBox *m_cb;


@@ -106,7 +179,10 @@ END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
 
 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) {
     // 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) {


@@ -145,11 +221,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 
     if ( m_text == NULL )
     {
 
     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
     {
     }
     else
     {

-        wxCoord wText = width - POPUPWIDTH;
+        wxCoord wText = width - POPUPWIDTH - MARGIN;

         m_text->SetSize(0, 0, wText, height);
         m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    
         m_text->SetSize(0, 0, wText, height);
         m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
     }    


@@ -187,6 +265,7 @@ void wxComboBox::SetFocus()
 
 void wxComboBox::DelegateTextChanged( const wxString& value )
 {
 
 void wxComboBox::DelegateTextChanged( const wxString& value )
 {

+    SetStringSelection( value );

 }
 
 
 }
 
 


@@ -200,15 +279,27 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,

-           int n, const wxString choices[],
+           const wxArrayString& choices,

            long style,
            const wxValidator& validator,
            const wxString& name)
 {
            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 );
+}

 
 

-    Rect bounds ;
-    Str255 title ;

 
 

+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           int n, const wxString choices[],
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{

     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {


@@ -216,7 +307,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     m_choice = new wxComboBoxChoice(this, style );
     }
 
     m_choice = new wxComboBoxChoice(this, style );

-
+    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;

     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {


@@ -237,6 +328,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
         m_choice->DoAppend( choices[ i ] );
     }
 

+    SetBestSize(csize);   // Needed because it is a wxControlWithItems
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -256,8 +349,18 @@ wxString wxComboBox::GetValue() const
     return result;
 }
 
     return result;
 }
 

+int wxComboBox::GetCount() const
+{ 
+    return m_choice->GetCount() ; 
+}
+

 void wxComboBox::SetValue(const wxString& value)
 {
 void wxComboBox::SetValue(const wxString& value)
 {

+    int s = FindString (value);
+    if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
+    {
+        m_choice->Append(value) ;
+    }

     SetStringSelection( value ) ;
 }
 
     SetStringSelection( value ) ;
 }
 


@@ -344,22 +447,59 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
     // TODO
 }
 

-void wxComboBox::Append(const wxString& item)
+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 ) ;
+}
+
+void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)

 {
 {

-    // I am not sure what other ports do,
-    // but wxMac chokes on empty entries.
+    return m_choice->DoSetItemClientObject( n , clientData ) ;
+}

 
 

-    if (!item.IsEmpty())
-        m_choice->DoAppend( item );
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
+{
+    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)
 {
 }
 
 void wxComboBox::Delete(int n)
 {

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

     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {
     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {

+    FreeData();

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


@@ -394,7 +534,7 @@ wxString wxComboBox::GetStringSelection() const
     if (sel > -1)
         return wxString(this->GetString (sel));
     else
     if (sel > -1)
         return wxString(this->GetString (sel));
     else

-        return wxString("");
+        return wxEmptyString;

 }
 
 bool wxComboBox::SetStringSelection(const wxString& sel)
 }
 
 bool wxComboBox::SetStringSelection(const wxString& sel)


@@ -409,12 +549,19 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
         return FALSE;
 }
 
         return FALSE;
 }
 

-void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxComboBox::SetString(int n, const wxString& s) 
+{
+    m_choice->SetString( n , s ) ;
+}
+
+
+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);
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);

+    return noErr ;

 }
 
 }