fix for [ 805216 ] dirMac does not properly skip directories from kevin hock

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index f158ee702e41278547ba0f162dee22f7a2e779bd..f18e9ec3fa4d24f6d0c63e56b95533d8ba795d91 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // the margin between the text control and the choice

-static const wxCoord MARGIN = 2;

 #if TARGET_API_MAC_OSX
 #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
 #else

-static const int    POPUPWIDTH = 18;
+static const wxCoord MARGIN = 2;
+static const int    TEXTFOCUSBORDER = 0 ;

 #endif
 static const int    POPUPHEIGHT = 23;
 
 #endif
 static const int    POPUPHEIGHT = 23;
 


@@ -59,9 +63,6 @@ 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:


@@ -142,9 +143,17 @@ 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);
+    }
+    int GetPopupWidth() const
+    {
+        switch ( GetWindowVariant() )
+        {
+            case wxWINDOW_VARIANT_NORMAL :
+            case wxWINDOW_VARIANT_LARGE :
+                return 24 ;
+            default :
+                return 21 ;
+        }

     }
 
 protected:
     }
 
 protected:


@@ -163,7 +172,7 @@ protected:
     {
         wxSize sz = wxChoice::DoGetBestSize() ;
         if (! m_cb->HasFlag(wxCB_READONLY) )
     {
         wxSize sz = wxChoice::DoGetBestSize() ;
         if (! m_cb->HasFlag(wxCB_READONLY) )

-            sz.x = POPUPWIDTH;
+            sz.x = GetPopupWidth() ;

         return sz ;
     }  
 
         return sz ;
     }  
 


@@ -202,23 +211,31 @@ 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 )
     {
         // we might not be fully constructed yet, therefore watch out...
     if ( m_text == NULL )
     {
         // we might not be fully constructed yet, therefore watch out...


@@ -227,9 +244,10 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     }
     else
     {
     }
     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);

     }    
 }
 
     }    
 }
 


@@ -307,7 +325,6 @@ 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 )
     {


@@ -316,8 +333,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 ;

         }
     }
     
         }
     }
     


@@ -328,7 +347,7 @@ 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
+    SetBestSize(size);   // Needed because it is a wxControlWithItems

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -356,12 +375,10 @@ int wxComboBox::GetCount() const
 
 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