// ----------------------------------------------------------------------------
// 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;
: wxTextCtrl( cb , 1 )
{
m_cb = cb;
-
- // remove the default minsize, the combobox will have one instead
- SetSizeHints(-1,-1);
}
protected:
void OnChar( wxKeyEvent& event )
{
+ // Allows processing the tab key to go to the next control
+ if (event.GetKeyCode() == WXK_TAB)
+ {
+ 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 ( event.GetKeyCode() == WXK_RETURN )
{
- wxString value = GetValue();
-
- 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 );
- }
+ 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 ) {
parent = parent->GetParent() ;
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
event.SetEventObject(def);
def->Command(event);
- return ;
}
}
event.Skip();
}
+ // Use the KeyUp as a naive approximation for TEXT_UPDATED, even though it is somewhat delayed
+ // but this is less complicated than dealing with idle-ness, and is much better than nothing
+ void OnKeyUp( wxKeyEvent& event )
+ {
+ if ( event.GetKeyCode() != WXK_RETURN )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId());
+ event.SetString( GetValue() );
+ event.SetEventObject( m_cb );
+ m_cb->GetEventHandler()->ProcessEvent(event);
+ }
+ }
private:
wxComboBox *m_cb;
BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
EVT_CHAR( wxComboBoxText::OnChar)
+ EVT_KEY_UP( wxComboBoxText::OnKeyUp)
END_EVENT_TABLE()
class wxComboBoxChoice : public wxChoice
: 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:
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 = POPUPWIDTH;
+ sz.x = GetPopupWidth() ;
return sz ;
}
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...
}
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);
}
}
}
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
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());
- ProcessCommand(event);
+ ProcessCommand(event);*/
return noErr ;
}
projects / wxWidgets.git / blobdiff