Correct slider width when labels are used.

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 6b5d168080f322fc34e54bd844f39e3d1f463980..7df584688994378bc34e5a5a8ba67a9275f7c06d 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -39,8 +39,18 @@ 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 = 6;
+static const int    POPUPWIDTH = 24;
+// this is the border a focus rect on OSX is needing
+static const int    TEXTFOCUSBORDER = 3 ;
+#else

 static const wxCoord MARGIN = 2;
 static const int    POPUPWIDTH = 18;
 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;
 
 


@@ -149,6 +159,13 @@ protected:
         event2.SetString(m_cb->GetStringSelection());
         m_cb->ProcessCommand(event2);
     }
         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;


@@ -185,23 +202,25 @@ 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();

-        
+        if (sizeText.y > size.y)
+            size.y = sizeText.y;

         size.x = POPUPWIDTH + sizeText.x + MARGIN;
         size.x = POPUPWIDTH + sizeText.x + MARGIN;

+        size.x += TEXTFOCUSBORDER ;
+        size.y += 2 * TEXTFOCUSBORDER ;

     }
     }

-

     return size;
 }
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     return size;
 }
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {

-    height = POPUPHEIGHT;
+    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...


@@ -211,8 +230,8 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;

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

     }    
 }
 
     }    
 }
 


@@ -290,7 +309,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 )
     {


@@ -299,8 +317,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 ;

         }
     }
     
         }
     }
     


@@ -311,7 +331,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;
 }


@@ -332,6 +352,11 @@ wxString wxComboBox::GetValue() const
     return result;
 }
 
     return result;
 }
 

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

 void wxComboBox::SetValue(const wxString& value)
 {
     int s = FindString (value);
 void wxComboBox::SetValue(const wxString& value)
 {
     int s = FindString (value);