#endif
#include "wx/combobox.h"
+#include "wx/button.h"
#include "wx/menu.h"
#include "wx/mac/uma.h"
{
public:
wxComboBoxText( wxComboBox * cb )
- : wxTextCtrl( cb->GetParent(), 1 )
+ : wxTextCtrl( cb , 1 )
{
m_cb = cb;
}
protected:
- void OnTextChange( wxCommandEvent& event )
+ void OnChar( wxKeyEvent& event )
{
- wxString s = GetValue();
-
- m_cb->DelegateTextChanged( s );
-
+ if ( event.KeyCode() == 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 );
+ }
+
+ // This will invoke the dialog default action, such
+ // as the clicking the default button.
+
+ wxWindow *parent = GetParent();
+ while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
+ parent = parent->GetParent() ;
+ }
+ if ( parent && parent->GetDefaultItem() )
+ {
+ wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
+ wxButton);
+ if ( def && def->IsEnabled() )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+ event.SetEventObject(def);
+ def->Command(event);
+ return ;
+ }
+ }
+
+ return;
+ }
+ }
+
event.Skip();
}
};
BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
- EVT_TEXT(-1, wxComboBoxText::OnTextChange)
+ EVT_CHAR( wxComboBoxText::OnChar)
END_EVENT_TABLE()
class wxComboBoxChoice : public wxChoice
{
public:
wxComboBoxChoice(wxComboBox *cb, int style)
- : wxChoice( cb->GetParent(), 1 )
+ : wxChoice( cb , 1 )
{
m_cb = cb;
}
wxString s = e.GetString();
m_cb->DelegateChoice( s );
+ wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+ event2.SetInt(m_cb->GetSelection());
+ event2.SetEventObject(m_cb);
+ event2.SetString(m_cb->GetStringSelection());
+ m_cb->ProcessCommand(event2);
}
private:
EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
END_EVENT_TABLE()
-
-
-
wxComboBox::~wxComboBox()
{
- // delete the controls now, don't leave them alive even though they woudl
+ // delete the controls now, don't leave them alive even though they would
// still be eventually deleted by our parent - but it will be too late, the
// user code expects them to be gone now
- delete m_text;
- delete m_choice;
+ if (m_text != NULL) {
+ delete m_text;
+ m_text = NULL;
+ }
+ if (m_choice != NULL) {
+ delete m_choice;
+ m_choice = NULL;
+ }
}
{
wxSize size = m_choice->GetBestSize();
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
wxSize sizeText = m_text->GetBestSize();
wxControl::DoMoveWindow(x, y, width, height);
- if ( m_text == 0 )
+ if ( m_text == NULL )
{
- m_choice->SetSize(x, y, width, -1);
+ m_choice->SetSize(0, 0 , width, -1);
}
else
{
wxCoord wText = width - POPUPWIDTH;
- m_text->SetSize(x, y, wText, height);
- m_choice->SetSize(x + wText + MARGIN, y, POPUPWIDTH, -1);
+ m_text->SetSize(0, 0, wText, height);
+ m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
}
}
if ( !wxControl::Enable(enable) )
return FALSE;
- m_choice->Enable(enable);
-
- if ( m_text != 0 )
- {
- m_text->Enable(enable);
- }
-
return TRUE;
}
if ( !wxControl::Show(show) )
return FALSE;
- // under GTK Show() is called the first time before we are fully
- // constructed
- if ( m_choice )
- {
- m_choice->Show(show);
- if ( m_text != 0 )
- {
- m_text->Show(show);
- }
- }
-
return TRUE;
}
- void wxComboBox::SetFocus()
- {
- m_text->SetFocus();
- }
+void wxComboBox::SetFocus()
+{
+ if ( m_text != NULL) {
+ m_text->SetFocus();
+ }
+}
-void wxComboBox::DelegateTextChanged( const wxString& value ) {
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{
+ SetStringSelection( value );
}
const wxValidator& validator,
const wxString& name)
{
-
- Rect bounds ;
- Str255 title ;
-
- if ( !wxControl::Create(parent, id, pos, size, style,
+ if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
wxDefaultValidator, name) )
{
return FALSE;
}
- m_choice = new wxComboBoxChoice(this, style);
+ m_choice = new wxComboBoxChoice(this, style );
wxSize csize = size;
if ( style & wxCB_READONLY )
{
- m_text = 0;
+ m_text = NULL;
}
else
{
}
DoSetSize(pos.x, pos.y, csize.x, csize.y);
+
for ( int i = 0 ; i < n ; i++ )
{
m_choice->DoAppend( choices[ i ] );
}
- // have to disable this window to avoid interfering it with message
- // processing to the text and the button... but pretend it is enabled to
- // make IsEnabled() return TRUE
- wxControl::Enable(FALSE); // don't use non virtual Disable() here!
- m_isEnabled = TRUE;
-
- // we don't even need to show this window itself - and not doing it avoids
- // that it overwrites the text control
- wxControl::Show(FALSE);
-
return TRUE;
}
{
wxString result;
- if ( m_text == 0 )
+ if ( m_text == NULL )
{
result = m_choice->GetString( m_choice->GetSelection() );
}
// Clipboard operations
void wxComboBox::Copy()
{
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->Copy();
}
void wxComboBox::Cut()
{
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->Cut();
}
void wxComboBox::Paste()
{
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->Paste();
}
void wxComboBox::SetEditable(bool editable)
{
- if ( ( m_text == 0 ) && editable )
+ if ( ( m_text == NULL ) && editable )
{
m_text = new wxComboBoxText( this );
}
- else if ( ( m_text != 0 ) && !editable )
+ else if ( ( m_text != NULL ) && !editable )
{
delete m_text;
- m_text = 0;
+ m_text = NULL;
}
int currentX, currentY;
void wxComboBox::Append(const wxString& item)
{
- m_choice->DoAppend( item );
+ // I am not sure what other ports do,
+ // but wxMac chokes on empty entries.
+
+ if (!item.IsEmpty())
+ m_choice->DoAppend( item );
}
void wxComboBox::Delete(int n)
{
m_choice->SetSelection( n );
- if ( m_text != 0 )
+ if ( m_text != NULL )
{
m_text->SetValue( GetString( n ) );
}
projects / wxWidgets.git / blobdiff