//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
-
+static int g_SelectionBeforePopup = -2; // -2 <=> the popup is hidden
//-----------------------------------------------------------------------------
-// "select-child" - click/cursor get select-child, changed, select-child
+// "changed" - typing and list item matches get changed, select-child
+// if it doesn't match an item then just get a single changed
//-----------------------------------------------------------------------------
static void
-gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
+ if (combo->m_ignoreNextUpdate)
+ {
+ combo->m_ignoreNextUpdate = false;
+ return;
+ }
+
if (!combo->m_hasVMT) return;
- if (g_blockEventsOnDrag) return;
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+ event.SetString( combo->GetValue() );
+ event.SetEventObject( combo );
+ combo->GetEventHandler()->ProcessEvent( event );
+}
- int curSelection = combo->GetSelection();
+static void
+gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+{
+}
- if (combo->m_prevSelection != curSelection)
+static void
+gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{
+ // when the popup is hidden, throw a SELECTED event only if the combobox
+ // selection changed.
+ int curSelection = combo->GetSelection();
+ if (g_SelectionBeforePopup != curSelection)
{
- GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
- gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
+ wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+ event.SetInt( curSelection );
+ event.SetString( combo->GetStringSelection() );
+ event.SetEventObject( combo );
+ combo->GetEventHandler()->ProcessEvent( event );
}
- combo->m_prevSelection = curSelection;
- wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
- event.SetInt( curSelection );
- event.SetString( combo->GetStringSelection() );
- event.SetEventObject( combo );
+ // reset the selection flag to an identifiable value (-2 = hidden)
+ g_SelectionBeforePopup = -2;
+}
- combo->GetEventHandler()->ProcessEvent( event );
+static void
+gtk_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{
+ // store the combobox selection value before the popup is shown
+ // if there is no selection, combo->GetSelection() returns -1
+ g_SelectionBeforePopup = combo->GetSelection();
}
//-----------------------------------------------------------------------------
-// "changed" - typing and list item matches get changed, select-child
-// if it doesn't match an item then just get a single changed
+// "select-child" - click/cursor get select-child, changed, select-child
//-----------------------------------------------------------------------------
static void
-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!combo->m_hasVMT) return;
- wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
- event.SetString( combo->GetValue() );
- event.SetEventObject( combo );
- combo->GetEventHandler()->ProcessEvent( event );
-}
+ if (g_blockEventsOnDrag) return;
-static void
-gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
-{
+ int curSelection = combo->GetSelection();
+
+ if (combo->m_prevSelection == curSelection) return;
+
+ GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
+ gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
+
+ combo->m_prevSelection = curSelection;
+
+ // Quickly set the value of the combo box
+ // as GTK+ does that only AFTER the event
+ // is sent.
+ gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry),
+ GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
+ combo->SetValue( combo->GetStringSelection() );
+ gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed",
+ GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
+
+ // throw a SELECTED event only if the combobox popup is hidden (-2)
+ // because when combobox popup is shown, gtk_combo_select_child_callback is
+ // called each times the mouse is over an item with a pressed button so a lot
+ // of SELECTED event could be generated if the user keep the mouse button down
+ // and select other items ...
+ if (g_SelectionBeforePopup == -2)
+ {
+ wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+ event.SetInt( curSelection );
+ event.SetString( combo->GetStringSelection() );
+ event.SetEventObject( combo );
+ combo->GetEventHandler()->ProcessEvent( event );
+ }
+
+ // Now send the event ourselves
+ wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+ event2.SetString( combo->GetValue() );
+ event2.SetEventObject( combo );
+ combo->GetEventHandler()->ProcessEvent( event2 );
}
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
EVT_SIZE(wxComboBox::OnSize)
EVT_CHAR(wxComboBox::OnChar)
+
+ EVT_MENU(wxID_CUT, wxComboBox::OnCut)
+ EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
+ EVT_MENU(wxID_PASTE, wxComboBox::OnPaste)
+ EVT_MENU(wxID_UNDO, wxComboBox::OnUndo)
+ EVT_MENU(wxID_REDO, wxComboBox::OnRedo)
+ EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete)
+ EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll)
+
+ EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut)
+ EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy)
+ EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste)
+ EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo)
+ EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
+ EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
+ EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
END_EVENT_TABLE()
bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator,
const wxString& name )
{
- m_alreadySent = FALSE;
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ m_ignoreNextUpdate = false;
+ m_needParent = true;
+ m_acceptsFocus = true;
m_prevSelection = 0;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxComboBox creation failed") );
- return FALSE;
+ return false;
}
m_widget = gtk_combo_new();
gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id );
// ... and add surogate handler.
combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
- (GtkSignalFunc) gtk_dummy_callback, combo);
+ (GtkSignalFunc) gtk_dummy_callback, combo);
// make it more useable
gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
// and case-sensitive
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
+#ifdef __WXGTK20__
+ if (style & wxNO_BORDER)
+ g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
+#endif
+
GtkWidget *list = GTK_COMBO(m_widget)->list;
#ifndef __WXGTK20__
if (style & wxCB_READONLY)
gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
- gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
+ // "show" and "hide" events are generated when user click on the combobox button which popups a list
+ // this list is the "popwin" gtk widget
+ gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "hide",
+ GTK_SIGNAL_FUNC(gtk_popup_hide_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
+ GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this );
+
+ gtk_signal_connect_after( GTK_OBJECT(combo->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
+ gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
SetBestSize(size); // need this too because this is a wxControlWithItems
// This is required for tool bar support
- wxSize setsize = GetSize();
- gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
-
- return TRUE;
+// wxSize setsize = GetSize();
+// gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
+
+ return true;
}
wxComboBox::~wxComboBox()
EnableEvents();
+ InvalidateBestSize();
+
return count - 1;
}
EnableEvents();
+ InvalidateBestSize();
+
return pos;
}
m_clientDataList.Clear();
EnableEvents();
+
+ InvalidateBestSize();
}
void wxComboBox::Delete( int n )
node = m_clientDataList.Item( n );
if (node)
m_clientDataList.Erase( node );
-
+
EnableEvents();
+
+ InvalidateBestSize();
}
void wxComboBox::SetString(int n, const wxString &text)
{
wxFAIL_MSG( wxT("wxComboBox: wrong index") );
}
+
+ InvalidateBestSize();
}
int wxComboBox::FindString( const wxString &item ) const
EnableEvents();
}
-bool wxComboBox::SetStringSelection( const wxString &string )
-{
- wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") );
-
- int res = FindString( string );
- if (res == -1) return false;
- SetSelection( res );
- return true;
-}
-
wxString wxComboBox::GetValue() const
{
GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
wxString tmp = wxT("");
if (!value.IsNull()) tmp = value;
gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
+
+ InvalidateBestSize();
}
void wxComboBox::Copy()
gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);
}
+void wxComboBox::Undo()
+{
+ // TODO
+}
+
+void wxComboBox::Redo()
+{
+ // TODO
+}
+
+void wxComboBox::SelectAll()
+{
+ SetSelection(0, GetLastPosition());
+}
+
+bool wxComboBox::CanUndo() const
+{
+ // TODO
+ return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+ // TODO
+ return false;
+}
+
+bool wxComboBox::HasSelection() const
+{
+ long from, to;
+ GetSelection(&from, &to);
+ return from != to;
+}
+
+bool wxComboBox::CanCopy() const
+{
+ // Can copy if there's a selection
+ return HasSelection();
+}
+
+bool wxComboBox::CanCut() const
+{
+ return CanCopy() && IsEditable();
+}
+
+bool wxComboBox::CanPaste() const
+{
+ // TODO: check for text on the clipboard
+ return IsEditable() ;
+}
+
+bool wxComboBox::IsEditable() const
+{
+ return !HasFlag(wxCB_READONLY);
+}
+
+
void wxComboBox::SetInsertionPoint( long pos )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
}
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
int pos = GTK_ENTRY(entry)->text_length;
gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
}
+void wxComboBox::GetSelection( long* from, long* to ) const
+{
+ if (IsEditable())
+ {
+ GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
+#ifdef __WXGTK20__
+ gint start, end;
+ gtk_editable_get_selection_bounds(editable, & start, & end);
+ *from = start;
+ *to = end;
+#else
+ *from = (long) editable->selection_start_pos;
+ *to = (long) editable->selection_end_pos;
+#endif
+ }
+}
+
void wxComboBox::SetEditable( bool editable )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
if (window->default_widget)
- gtk_widget_activate (window->default_widget);
+ gtk_widget_activate (window->default_widget);
}
}
void wxComboBox::EnableEvents()
{
- gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
+ gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
+ gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
}
void wxComboBox::OnSize( wxSizeEvent &event )
{
- event.Skip();
-
-#if 0
- int w = 21;
- gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
+ // NB: In some situations (e.g. on non-first page of a wizard, if the
+ // size used is default size), GtkCombo widget is resized correctly,
+ // but it's look is not updated, it's rendered as if it was much wider.
+ // No other widgets are affected, so it looks like a bug in GTK+.
+ // Manually requesting resize calculation (as gtk_pizza_set_size does)
+ // fixes it.
+ if (GTK_WIDGET_VISIBLE(m_widget))
+ gtk_widget_queue_resize(m_widget);
- gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
- gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
-#endif // 0
+ event.Skip();
}
void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
// gtk_widget_modify_style( GTK_COMBO(m_widget)->button, syle );
+
gtk_widget_modify_style( GTK_COMBO(m_widget)->entry, style );
gtk_widget_modify_style( GTK_COMBO(m_widget)->list, style );
// we know better our horizontal extent: it depends on the longest string
// in the combobox
- ret.x = 0;
if ( m_widget )
{
int width;
return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true);
}
+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------
+
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))
+{
+ Cut();
+}
+
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+ Copy();
+}
+
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+ Paste();
+}
+
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))
+{
+ Undo();
+}
+
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
+{
+ Redo();
+}
+
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
+{
+ long from, to;
+ GetSelection(& from, & to);
+ if (from != -1 && to != -1)
+ Remove(from, to);
+}
+
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
+{
+ SetSelection(-1, -1);
+}
+
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
+{
+ event.Enable( CanCut() );
+}
+
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)
+{
+ event.Enable( CanCopy() );
+}
+
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)
+{
+ event.Enable( CanPaste() );
+}
+
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+ event.Enable( CanUndo() );
+}
+
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+ event.Enable( CanRedo() );
+}
+
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
+{
+ event.Enable(HasSelection() && IsEditable()) ;
+}
+
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+ event.Enable(GetLastPosition() > 0);
+}
+
#endif
+
projects / wxWidgets.git / blobdiff