otherwise we always fall back to blitting, even if we can provide better results

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 494f6889215770da2c8980c4b612431db5cefd44..40caccafc811508aa3f097b668bc2d71ea389a9b 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "combobox.h"
 #endif
 
 #pragma implementation "combobox.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
+

 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"


@@ -26,7 +30,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 
 static int nextPopUpMenuId = 1000 ;
 
 
 static int nextPopUpMenuId = 1000 ;

-MenuHandle NewUniqueMenu() 
+MenuHandle NewUniqueMenu()

 {
   MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
   nextPopUpMenuId++ ;
 {
   MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
   nextPopUpMenuId++ ;


@@ -39,8 +43,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 +72,41 @@ public:
 protected:
     void OnChar( wxKeyEvent& event )
     {
 protected:
     void OnChar( wxKeyEvent& event )
     {

-        if ( event.GetKeyCode() == WXK_RETURN )
+        // Allows processing the tab key to go to the next control
+        if (event.GetKeyCode() == WXK_TAB)

         {
         {

-            wxString value = GetValue();
+            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 ( 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 );
-                }
+        // send the event to the combobox class in case the user has bound EVT_CHAR
+        wxKeyEvent kevt(event);
+        kevt.SetEventObject(m_cb);
+        if (m_cb->GetEventHandler()->ProcessEvent(kevt))
+            // If the event was handled and not skipped then we're done
+            return;
+        
+        if ( event.GetKeyCode() == WXK_RETURN )
+        {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());
+            event.SetString( GetValue() );
+            event.SetInt( m_cb->GetSelection() );
+            event.SetEventObject( m_cb );

 
 

-                // 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,17 +117,40 @@ 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 ;

                    }
                 }
 
                 return;
             }
         }
                    }
                 }
 
                 return;
             }
         }

-        
+

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

+    void OnKeyUp( wxKeyEvent& event )
+    {
+        event.SetEventObject(m_cb);
+        event.SetId(m_cb->GetId());
+        if (! m_cb->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
+    }
+
+    void OnKeyDown( wxKeyEvent& event )
+    {
+        event.SetEventObject(m_cb);
+        event.SetId(m_cb->GetId());
+        if (! m_cb->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
+    }
+    
+    void OnText( wxCommandEvent& event )
+    {
+        event.SetEventObject(m_cb);
+        event.SetId(m_cb->GetId());
+        if (! m_cb->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
+    }        
+

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


@@ -125,17 +158,31 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)

-    EVT_CHAR( wxComboBoxText::OnChar)
+    EVT_KEY_DOWN( wxComboBoxText::OnKeyDown)
+    EVT_CHAR(     wxComboBoxText::OnChar)
+    EVT_KEY_UP(   wxComboBoxText::OnKeyUp)
+    EVT_TEXT( -1, wxComboBoxText::OnText)

 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:
     wxComboBoxChoice(wxComboBox *cb, int style)
 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:
     wxComboBoxChoice(wxComboBox *cb, int style)

-        : wxChoice( cb , 1 )
+        : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) )

     {
         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,6 +195,20 @@ 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:
     }
 
 private:


@@ -162,7 +223,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,33 +246,44 @@ wxComboBox::~wxComboBox()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
 
 wxSize wxComboBox::DoGetBestSize() const
 {

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

     wxSize size = m_choice->GetBestSize();
     wxSize size = m_choice->GetBestSize();

-    
+

     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->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;
-    
-    wxControl::DoMoveWindow(x, y, width, height);
+void wxComboBox::DoMoveWindow(int x, int y, int width, int 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);
+    }

 }
 
 
 }
 
 


@@ -220,17 +295,17 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxComboBox::SetFocus()
 }
 
 void wxComboBox::SetFocus()


@@ -253,6 +328,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,


@@ -263,13 +354,12 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,

-                            wxDefaultValidator, name) )
+                            validator, name) )

     {
     {

-        return FALSE;
+        return false;

     }
 
     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,25 +368,30 @@ 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 ;

         }
     }
         }
     }

-    
+

     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     DoSetSize(pos.x, pos.y, csize.x, csize.y);

-    
+

     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 
     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 

-    return TRUE;
+    SetBestSize(size);   // Needed because it is a wxControlWithItems
+    SetStringSelection(value);
+    
+    return true;

 }
 
 wxString wxComboBox::GetValue() const
 {
     wxString        result;
 }
 
 wxString wxComboBox::GetValue() const
 {
     wxString        result;

-    
+

     if ( m_text == NULL )
     {
         result = m_choice->GetString( m_choice->GetSelection() );
     if ( m_text == NULL )
     {
         result = m_choice->GetString( m_choice->GetSelection() );


@@ -309,14 +404,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


@@ -358,7 +456,7 @@ void wxComboBox::SetEditable(bool editable)
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );

-    
+

     int currentW, currentH;
     GetSize( &currentW, &currentH );
 
     int currentW, currentH;
     GetSize( &currentW, &currentH );
 


@@ -381,7 +479,7 @@ long wxComboBox::GetInsertionPoint() const
     return 0;
 }
 
     return 0;
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -402,26 +500,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)

 {
 {

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

 
 

-    if (!item.IsEmpty())
-        m_choice->DoAppend( item );
+void* wxComboBox::DoGetItemClientData(int n) const
+{
+    return m_choice->DoGetItemClientData( n ) ;

 }
 
 }
 

-void wxComboBox::Delete(int 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();
 }
 


@@ -433,7 +564,7 @@ int wxComboBox::GetSelection() const
 void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );
 void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );

-    
+

     if ( m_text != NULL )
     {
         m_text->SetValue( GetString( n ) );
     if ( m_text != NULL )
     {
         m_text->SetValue( GetString( n ) );


@@ -456,27 +587,86 @@ 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)
+void wxComboBox::SetString(int n, const wxString& s)

 {
 {

-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return TRUE;
-        }
+    m_choice->SetString( n , s ) ;
+}
+
+bool wxComboBox::IsEditable() const
+{
+    return m_text != NULL && !HasFlag(wxCB_READONLY);
+}
+
+void wxComboBox::Undo()
+{
+    if (m_text != NULL)
+        m_text->Undo();
+}
+
+void wxComboBox::Redo()
+{
+    if (m_text != NULL)
+        m_text->Redo();
+}
+
+void wxComboBox::SelectAll()
+{
+    if (m_text != NULL)
+        m_text->SelectAll();
+}
+
+bool wxComboBox::CanCopy() const
+{
+    if (m_text != NULL)
+        return m_text->CanCopy();
+    else
+        return false;
+}
+
+bool wxComboBox::CanCut() const
+{
+    if (m_text != NULL)
+        return m_text->CanCut();
+    else
+        return false;
+}
+
+bool wxComboBox::CanPaste() const
+{
+    if (m_text != NULL)
+        return m_text->CanPaste();
+    else
+        return false;
+}
+
+bool wxComboBox::CanUndo() const
+{
+    if (m_text != NULL)
+        return m_text->CanUndo();
+    else
+        return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+    if (m_text != NULL)
+        return m_text->CanRedo();

     else
     else

-        return FALSE;
+        return false;

 }
 
 }
 

-void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) ) 
+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 ;

 }
 
 }
 

+#endif