X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07014b5a0af156077f85ae45b6c5d5162d5cfb76..74a3342702bf3a76a845f65f4510fd8612d3d802:/src/gtk/radiobox.cpp?ds=sidebyside diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 1775b3105d..33f01ccb61 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -16,22 +16,40 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/frame.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" -#include "wx/frame.h" +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif #include "wx/gtk/private.h" #include -#include "wx/gtk/win_gtk.h" +//----------------------------------------------------------------------------- +// wxGTKRadioButtonInfo +//----------------------------------------------------------------------------- +// structure internally used by wxRadioBox to store its child buttons + +class wxGTKRadioButtonInfo : public wxObject +{ +public: + wxGTKRadioButtonInfo( GtkRadioButton * abutton, const wxRect & arect ) + : button( abutton ), rect( arect ) {} + + GtkRadioButton * button; + wxRect rect; +}; //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- +#include "wx/listimpl.cpp" +WX_DEFINE_LIST( wxRadioBoxButtonsInfoList ) + extern bool g_blockEventsOnDrag; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -40,8 +58,6 @@ extern wxWindowGTK *g_delayedFocus; extern "C" { static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!rb->m_hasVMT) return; if (g_blockEventsOnDrag) return; @@ -51,7 +67,7 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo event.SetInt( rb->GetSelection() ); event.SetString( rb->GetStringSelection() ); event.SetEventObject( rb ); - rb->GetEventHandler()->ProcessEvent(event); + rb->HandleWindowEvent(event); } } @@ -62,9 +78,6 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo extern "C" { static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!rb->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; @@ -79,7 +92,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ // CTRL-TAB changes the (parent) window, i.e. switch notebook page new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); new_event.SetCurrentFocus( rb ); - return rb->GetParent()->GetEventHandler()->ProcessEvent( new_event ); + return rb->GetParent()->HandleWindowEvent(new_event); } if ((gdk_event->keyval != GDK_Up) && @@ -90,31 +103,33 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return FALSE; } - wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = rb->m_buttonsInfo.GetFirst(); + while( node && GTK_WIDGET( node->GetData()->button ) != widget ) + { + node = node->GetNext(); + } if (!node) { return FALSE; } - g_signal_stop_emission_by_name (widget, "key_press_event"); - if ((gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Left)) { - if (node == rb->m_boxes.GetFirst()) - node = rb->m_boxes.GetLast(); + if (node == rb->m_buttonsInfo.GetFirst()) + node = rb->m_buttonsInfo.GetLast(); else node = node->GetPrevious(); } else { - if (node == rb->m_boxes.GetLast()) - node = rb->m_boxes.GetFirst(); + if (node == rb->m_buttonsInfo.GetLast()) + node = rb->m_buttonsInfo.GetFirst(); else node = node->GetNext(); } - GtkWidget *button = (GtkWidget*) node->GetData(); + GtkWidget *button = (GtkWidget*) node->GetData()->button; gtk_widget_grab_focus( button ); @@ -123,65 +138,65 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ } extern "C" { -static gint gtk_radiobutton_focus_in( GtkWidget *widget, - GdkEvent *WXUNUSED(event), - wxRadioBox *win ) +static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget), + GdkEventFocus *WXUNUSED(event), + wxRadioBox *win ) { - if ( win->m_lostFocus ) - { - // no, we didn't really lose it - win->m_lostFocus = FALSE; - } - else if ( !win->m_hasFocus ) - { - win->m_hasFocus = true; - - wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); - event.SetEventObject( win ); - - // never stop the signal emission, it seems to break the kbd handling - // inside the radiobox - (void)win->GetEventHandler()->ProcessEvent( event ); - } - + // NB: This control is composed of several GtkRadioButton widgets and + // when focus changes from one of them to another in the same + // wxRadioBox, we get a focus-out event followed by focus-in for + // another GtkRadioButton owned by the same control. We don't want + // to generate two spurious wxEVT_SET_FOCUS events in this case, + // so we defer sending wx events until idle time. + win->GTKHandleFocusOut(); + + // never stop the signal emission, it seems to break the kbd handling + // inside the radiobox return FALSE; } } extern "C" { -static gint gtk_radiobutton_focus_out( GtkWidget *widget, - GdkEvent *WXUNUSED(event), - wxRadioBox *win ) +static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget), + GdkEventFocus *WXUNUSED(event), + wxRadioBox *win ) { - // wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") ); - // Replace with a warning, else we dump core a lot! - // if (!win->m_hasFocus) - // wxLogWarning(_T("Radiobox got focus out without any focus in.") ); - - // we might have lost the focus, but may be not - it may have just gone to - // another button in the same radiobox, so we'll check for it in the next - // idle iteration (leave m_hasFocus == true for now) - win->m_lostFocus = true; + win->GTKHandleFocusIn(); + // never stop the signal emission, it seems to break the kbd handling + // inside the radiobox return FALSE; } } +extern "C" { +static void gtk_radiobutton_size_allocate( GtkWidget *widget, + GtkAllocation * alloc, + wxRadioBox *win ) +{ + for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = win->m_buttonsInfo.GetFirst(); + node; + node = node->GetNext()) + { + if (widget == GTK_WIDGET(node->GetData()->button)) + { + const wxPoint origin = win->GetPosition(); + wxRect rect = wxRect( alloc->x - origin.x, alloc->y - origin.y, + alloc->width, alloc->height ); + node->GetData()->rect = rect; + break; + } + } +} +} + + //----------------------------------------------------------------------------- // wxRadioBox //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) -void wxRadioBox::Init() -{ - m_needParent = true; - m_acceptsFocus = true; - - m_hasFocus = - m_lostFocus = false; -} - bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint &pos, const wxSize &size, @@ -209,7 +224,14 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, } m_widget = GTKCreateFrame(title); + g_object_ref(m_widget); wxControl::SetLabel(title); + if ( HasFlag(wxNO_BORDER) ) + { + // If we don't do this here, the wxNO_BORDER style is ignored in Show() + gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE); + } + // majorDim may be 0 if all trailing parameters were omitted, so don't // assert here but just use the correct value for it @@ -235,7 +257,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(rbtn) ); label.Empty(); - for ( const wxChar *pc = choices[i]; *pc; pc++ ) + for ( wxString::const_iterator pc = choices[i].begin(); + pc != choices[i].end(); ++pc ) { if ( *pc != wxT('&') ) label += *pc; @@ -247,7 +270,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, g_signal_connect (rbtn, "key_press_event", G_CALLBACK (gtk_radiobox_keypress_callback), this); - m_boxes.Append( (wxObject*) rbtn ); + m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) ); if (HasFlag(wxRA_SPECIFY_COLS)) { @@ -279,6 +302,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, G_CALLBACK (gtk_radiobutton_focus_in), this); g_signal_connect (rbtn, "focus_out_event", G_CALLBACK (gtk_radiobutton_focus_out), this); + g_signal_connect (rbtn, "size_allocate", + G_CALLBACK (gtk_radiobutton_size_allocate), this); } m_parent->DoAddChild( this ); @@ -290,13 +315,14 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, wxRadioBox::~wxRadioBox() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); gtk_widget_destroy( button ); node = node->GetNext(); } + WX_CLEAR_LIST( wxRadioBoxButtonsInfoList, m_buttonsInfo ); } bool wxRadioBox::Show( bool show ) @@ -312,10 +338,10 @@ bool wxRadioBox::Show( bool show ) if ( HasFlag(wxNO_BORDER) ) gtk_widget_hide( m_widget ); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); if (show) gtk_widget_show( button ); @@ -328,34 +354,15 @@ bool wxRadioBox::Show( bool show ) return true; } -void wxRadioBox::SetFocus() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - - if (m_boxes.GetCount() == 0) return; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); - if (button->active) - { - gtk_widget_grab_focus( GTK_WIDGET(button) ); - return; - } - node = node->GetNext(); - } -} - void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( n ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); GtkDisableEvents(); @@ -370,10 +377,10 @@ int wxRadioBox::GetSelection(void) const int count = 0; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); if (button->active) return count; count++; node = node->GetNext(); @@ -388,11 +395,11 @@ wxString wxRadioBox::GetString(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( n ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n ); wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") ); - GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child); + GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child); wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); @@ -410,11 +417,11 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child); + GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child); gtk_label_set_text( g_label, wxGTK_CONV( label ) ); } @@ -424,10 +431,10 @@ bool wxRadioBox::Enable( bool enable ) if ( !wxControl::Enable( enable ) ) return false; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); @@ -442,11 +449,11 @@ bool wxRadioBox::Enable(unsigned int item, bool enable) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); @@ -459,11 +466,11 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if // the parent radiobox is disabled @@ -474,11 +481,11 @@ bool wxRadioBox::Show(unsigned int item, bool show) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); if (show) gtk_widget_show( button ); @@ -492,28 +499,27 @@ bool wxRadioBox::IsItemShown(unsigned int item) const { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } unsigned int wxRadioBox::GetCount() const { - return m_boxes.GetCount(); + return m_buttonsInfo.GetCount(); } void wxRadioBox::GtkDisableEvents() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - g_signal_handlers_disconnect_by_func (node->GetData(), - (gpointer) gtk_radiobutton_clicked_callback, - this); + g_signal_handlers_block_by_func(node->GetData()->button, + (gpointer)gtk_radiobutton_clicked_callback, this); node = node->GetNext(); } @@ -521,11 +527,11 @@ void wxRadioBox::GtkDisableEvents() void wxRadioBox::GtkEnableEvents() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - g_signal_connect (node->GetData(), "clicked", - G_CALLBACK (gtk_radiobutton_clicked_callback), this); + g_signal_handlers_unblock_by_func(node->GetData()->button, + (gpointer)gtk_radiobutton_clicked_callback, this); node = node->GetNext(); } @@ -535,10 +541,10 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->GetData() ); + GtkWidget *widget = GTK_WIDGET( node->GetData()->button ); gtk_widget_modify_style( widget, style ); gtk_widget_modify_style(GTK_BIN(widget)->child, style); @@ -558,58 +564,49 @@ void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w) } #if wxUSE_TOOLTIPS -void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) +void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip) { - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) + // set this tooltip for all radiobuttons which don't have their own tips + unsigned n = 0; + for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); + node; + node = node->GetNext(), n++ ) { - GtkWidget *widget = GTK_WIDGET( node->GetData() ); - gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); - node = node->GetNext(); + if ( !GetItemToolTip(n) ) + { + wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), tip); + } } } -#endif // wxUSE_TOOLTIPS -bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) +void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) { - if (window == m_widget->window) - return true; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkWidget *button = GTK_WIDGET( node->GetData() ); - - if (window == button->window) - return true; - - node = node->GetNext(); - } + wxCharBuffer buf; + if ( !tooltip ) + tooltip = GetToolTip(); + if ( tooltip ) + buf = wxGTK_CONV(tooltip->GetTip()); - return false; + wxToolTip::Apply(GTK_WIDGET(m_buttonsInfo[n]->button), buf); } -void wxRadioBox::OnInternalIdle() +#endif // wxUSE_TOOLTIPS + +GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const { - if ( m_lostFocus ) + windows.push_back(m_widget->window); + + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); + while (node) { - m_hasFocus = false; - m_lostFocus = false; + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); - wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); - event.SetEventObject( this ); + windows.push_back(button->window); - (void)GetEventHandler()->ProcessEvent( event ); + node = node->GetNext(); } - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - g_delayedFocus = NULL; - SetFocus(); - } - } + return NULL; } // static @@ -626,4 +623,18 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return attr; } +int wxRadioBox::GetItemFromPoint(const wxPoint& point) const +{ + const wxPoint pt = ScreenToClient(point); + unsigned n = 0; + for ( wxRadioBoxButtonsInfoList::compatibility_iterator + node = m_buttonsInfo.GetFirst(); node; node = node->GetNext(), n++ ) + { + if ( m_buttonsInfo[n]->rect.Contains(pt) ) + return n; + } + + return wxNOT_FOUND; +} + #endif // wxUSE_RADIOBOX