#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;
+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 int POPUPWIDTH = 18;
+static const int TEXTFOCUSBORDER = 0 ;
#endif
static const int POPUPHEIGHT = 23;
: wxTextCtrl( cb , 1 )
{
m_cb = cb;
-
- // remove the default minsize, the combobox will have one instead
- SetSizeHints(-1,-1);
}
protected:
: 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:
{
wxSize sz = wxChoice::DoGetBestSize() ;
if (! m_cb->HasFlag(wxCB_READONLY) )
- sz.x = POPUPWIDTH;
+ sz.x = GetPopupWidth() ;
return sz ;
}
wxSize wxComboBox::DoGetBestSize() const
{
- if (!m_choice || !m_text)
+ if (!m_choice && !m_text)
return GetSize();
wxSize size = m_choice->GetBestSize();
wxSize sizeText = m_text->GetBestSize();
if (sizeText.y > size.y)
size.y = sizeText.y;
- size.x = POPUPWIDTH + sizeText.x + MARGIN;
+ 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;
- int origin = 0;
-#if TARGET_API_MAC_OSX
- // give the controls some padding so that the text ctrl's borders
- // and blue highlight can appear
- origin = 4;
-#endif
-
- wxControl::DoMoveWindow(x, y, width + origin, height + origin);
-
+void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
+{
+ wxControl::DoMoveWindow(x, y, width , height );
+
if ( m_text == NULL )
{
// we might not be fully constructed yet, therefore watch out...
}
else
{
- wxCoord wText = width - POPUPWIDTH - MARGIN;
-#if TARGET_API_MAC_OSX
- // also, we need to shrink the size of the wxTextCtrl a bit
- // to make it appear properly on OS X.
- height -= 8;
- wText -= 8;
-#endif
- m_text->SetSize(origin, origin, wText, height);
- m_choice->SetSize(origin + 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);
}
}
}
m_choice = new wxComboBoxChoice(this, style );
- m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;
wxSize csize = size;
if ( style & wxCB_READONLY )
{
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 ;
}
}
m_choice->DoAppend( choices[ i ] );
}
- SetBestSize(csize); // Needed because it is a wxControlWithItems
+ SetBestSize(size); // Needed because it is a wxControlWithItems
return TRUE;
}
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