*** empty log message ***

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 494f6889215770da2c8980c4b612431db5cefd44..196c2e1d3cef4aa8c3645fc4a6cc2cf82b93576b 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -39,8 +39,16 @@ MenuHandle NewUniqueMenu()
 // ----------------------------------------------------------------------------
 
 // the margin between the text control and the choice
 // ----------------------------------------------------------------------------
 
 // the margin between the text control and the choice

+#if TARGET_API_MAC_OSX
+// margin should be bigger on OS X due to blue highlight
+// around text control.
+static const wxCoord MARGIN = 4;
+// this is the border a focus rect on OSX is needing
+static const int    TEXTFOCUSBORDER = 3 ;
+#else

 static const wxCoord MARGIN = 2;
 static const wxCoord MARGIN = 2;

-static const int    POPUPWIDTH = 18;
+static const int    TEXTFOCUSBORDER = 0 ;
+#endif

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


@@ -60,43 +68,33 @@ public:
 protected:
     void OnChar( wxKeyEvent& event )
     {
 protected:
     void OnChar( wxKeyEvent& event )
     {

+       // Allows processing the tab key to go to the next control
+       if (event.GetKeyCode() == WXK_TAB)
+       {
+               wxNavigationKeyEvent NavEvent;
+               NavEvent.SetEventObject(this);
+               NavEvent.SetDirection(true);
+               NavEvent.SetWindowChange(false);
+               
+                // Get the parent of the combo and have it process the navigation?
+               if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent))
+                    return;
+       }

         if ( event.GetKeyCode() == WXK_RETURN )
         {
         if ( event.GetKeyCode() == WXK_RETURN )
         {

-            wxString value = GetValue();
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());
+            event.SetString( GetValue() );
+            event.SetInt( m_cb->GetSelection() );
+            event.SetEventObject( m_cb );

 
 

-            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.
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.

 
 

+            if (!m_cb->GetEventHandler()->ProcessEvent( event ))
+            {

                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {

-                  parent = parent->GetParent() ;
+                    parent = parent->GetParent() ;

                 }
                 if ( parent && parent->GetDefaultItem() )
                 {
                 }
                 if ( parent && parent->GetDefaultItem() )
                 {


@@ -107,7 +105,6 @@ protected:
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);

-                        return ;

                    }
                 }
 
                    }
                 }
 


@@ -118,6 +115,18 @@ protected:
         event.Skip();
     }
 
         event.Skip();
     }
 

+    // Use the KeyUp as a naive approximation for TEXT_UPDATED, even though it is somewhat delayed
+    // but this is less complicated than dealing with idle-ness, and is much better than nothing
+    void OnKeyUp( wxKeyEvent& event )
+    {
+        if ( event.GetKeyCode() != WXK_RETURN )
+        {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId());
+            event.SetString( GetValue() );
+            event.SetEventObject( m_cb );
+            m_cb->GetEventHandler()->ProcessEvent(event);            
+        }
+    }

 private:
     wxComboBox *m_cb;
 
 private:
     wxComboBox *m_cb;
 


@@ -126,6 +135,7 @@ private:
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
     EVT_CHAR( wxComboBoxText::OnChar)
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
     EVT_CHAR( wxComboBoxText::OnChar)

+    EVT_KEY_UP( wxComboBoxText::OnKeyUp)

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


@@ -136,6 +146,17 @@ public:
     {
         m_cb = cb;
     }
     {
         m_cb = cb;
     }

+    int GetPopupWidth() const
+    {
+        switch ( GetWindowVariant() )
+        {
+            case wxWINDOW_VARIANT_NORMAL :
+            case wxWINDOW_VARIANT_LARGE :
+                return 24 ;
+            default :
+                return 21 ;
+        }
+    }

 
 protected:
     void OnChoice( wxCommandEvent& e )
 
 protected:
     void OnChoice( wxCommandEvent& e )


@@ -148,7 +169,21 @@ protected:
         event2.SetEventObject(m_cb);
         event2.SetString(m_cb->GetStringSelection());
         m_cb->ProcessCommand(event2);
         event2.SetEventObject(m_cb);
         event2.SetString(m_cb->GetStringSelection());
         m_cb->ProcessCommand(event2);

+
+        // For consistency with MSW and GTK, also send a text updated event
+        // After all, the text is updated when a selection is made
+        wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId() );
+        TextEvent.SetString( m_cb->GetStringSelection() );
+        TextEvent.SetEventObject( m_cb );
+        m_cb->ProcessCommand( TextEvent );

     }
     }

+    virtual wxSize DoGetBestSize() const
+    {
+        wxSize sz = wxChoice::DoGetBestSize() ;
+        if (! m_cb->HasFlag(wxCB_READONLY) )
+            sz.x = GetPopupWidth() ;
+        return sz ;
+    }  

 
 private:
     wxComboBox *m_cb;
 
 private:
     wxComboBox *m_cb;


@@ -162,7 +197,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) {


@@ -182,32 +220,43 @@ wxComboBox::~wxComboBox()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
 
 wxSize wxComboBox::DoGetBestSize() const
 {

+    if (!m_choice && !m_text)
+        return GetSize();

     wxSize size = m_choice->GetBestSize();
     
     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();
     wxSize size = m_choice->GetBestSize();
     
     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();

-        
-        size.x = POPUPWIDTH + sizeText.x + MARGIN;
+        if (sizeText.y > size.y)
+            size.y = sizeText.y;
+        size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN;
+        size.x += TEXTFOCUSBORDER ;
+        size.y += 2 * TEXTFOCUSBORDER ;
+    }
+    else
+    {
+        // clipping is too tight
+        size.y += 1 ;

     }
     }

-

     return size;
 }
 
     return size;
 }
 

-void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
-    height = POPUPHEIGHT;
+void wxComboBox::DoMoveWindow(int x, int y, int width, int height) 
+{
+    wxControl::DoMoveWindow(x, y, width , height );

     
     

-    wxControl::DoMoveWindow(x, y, width, 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;
-        m_text->SetSize(0, 0, wText, height);
-        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
+        wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN;
+        m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1 );
+        // put it at an inset of 1 to have outer area shadows drawn as well
+        m_choice->SetSize(TEXTFOCUSBORDER + wText + MARGIN - 1 , TEXTFOCUSBORDER, m_choice->GetPopupWidth() , -1);

     }    
 }
 
     }    
 }
 


@@ -253,6 +302,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,
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,


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

-

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


@@ -278,8 +342,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     else
     {
         m_text = new wxComboBoxText(this);
     else
     {
         m_text = new wxComboBoxText(this);

-        if ( size.y == -1 ) {
-          csize.y = m_text->GetSize().y ;
+        if ( size.y == -1 ) 
+        {
+            csize.y = m_text->GetSize().y ;
+            csize.y += 2 * TEXTFOCUSBORDER ;

         }
     }
     
         }
     }
     


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

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

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -309,14 +377,17 @@ 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 ) ;
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection( value ) ;
+    else
+        m_text->SetValue( value );

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations


@@ -402,26 +473,59 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
     // TODO
 }
 

-void wxComboBox::Append(const wxString& item)
+int wxComboBox::DoAppend(const wxString& item) 

 {
 {

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

 
 

-    if (!item.IsEmpty())
-        m_choice->DoAppend( item );
+int wxComboBox::DoInsert(const wxString& item, int pos) 
+{
+    return m_choice->DoInsert( item , pos ) ;

 }
 
 }
 

-void wxComboBox::Delete(int n)
+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)
+{
+    return m_choice->DoSetItemClientObject( n , clientData ) ;
+}
+
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
+{
+    return m_choice->DoGetItemClientObject( n ) ;
+}
+
+void wxComboBox::FreeData()

 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {

-        SetClientObject(n, NULL);
+        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()
 {
     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {

+    FreeData();

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


@@ -456,7 +560,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)


@@ -471,12 +575,20 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
         return FALSE;
 }
 
         return FALSE;
 }
 

-void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) ) 
+void wxComboBox::SetString(int n, const wxString& s) 
+{
+    m_choice->SetString( n , s ) ;
+}
+
+
+wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 

 {
 {

+    /* For consistency with other platforms, clicking in the text area does not constitute a selection

     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());

-    ProcessCommand(event);
+    ProcessCommand(event);*/
+    return noErr ;

 }
 
 }