X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46cc7c4e64bd885818aa6022e182fce4d2ca6992..b16f4bfab29a541cbb24febe07983087776388cb:/src/mac/carbon/combobox.cpp

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 49b3c86c79..f18e9ec3fa 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -39,11 +39,15 @@ 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;
+// 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 int    POPUPWIDTH = 18;
+static const wxCoord MARGIN = 2;
+static const int    TEXTFOCUSBORDER = 0 ;
 #endif
 static const int    POPUPHEIGHT = 23;
 
@@ -140,6 +144,17 @@ public:
     {
         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 )
@@ -156,7 +171,8 @@ protected:
     virtual wxSize DoGetBestSize() const
     {
         wxSize sz = wxChoice::DoGetBestSize() ;
-        sz.x = POPUPWIDTH ;
+        if (! m_cb->HasFlag(wxCB_READONLY) )
+            sz.x = GetPopupWidth() ;
         return sz ;
     }  
 
@@ -195,23 +211,31 @@ wxComboBox::~wxComboBox()
 
 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();
-        
-        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;
 }
 
-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 )
     {
         // we might not be fully constructed yet, therefore watch out...
@@ -220,9 +244,10 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     }
     else
     {
-        wxCoord wText = width - POPUPWIDTH - MARGIN;
-        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);
     }    
 }
 
@@ -300,7 +325,6 @@ 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 )
     {
@@ -309,8 +333,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     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 ;
         }
     }
     
@@ -321,7 +347,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
-    SetBestSize(csize);   // Needed because it is a wxControlWithItems
+    SetBestSize(size);   // Needed because it is a wxControlWithItems
 
     return TRUE;
 }
@@ -349,12 +375,10 @@ int wxComboBox::GetCount() const
 
 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