X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b06ac1f24a3e25aa88f813ac6d91452b907e993..1cff04deb5c17c95bef9c83e72645f105b90e750:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 594cf793f8..3d70c8d4e1 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -21,8 +21,7 @@ #include "wx/frame.h" #include "wx/log.h" -#include -#include +#include "wx/gtk/private.h" #include #include "wx/gtk/win_gtk.h" @@ -38,7 +37,8 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -91,20 +91,20 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ if ((gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Left)) { - if (node == rb->m_boxes.First()) - node = rb->m_boxes.Last(); + if (node == rb->m_boxes.GetFirst()) + node = rb->m_boxes.GetLast(); else - node = node->Previous(); + node = node->GetPrevious(); } else { - if (node == rb->m_boxes.Last()) - node = rb->m_boxes.First(); + if (node == rb->m_boxes.GetLast()) + node = rb->m_boxes.GetFirst(); else - node = node->Next(); + node = node->GetNext(); } - GtkWidget *button = (GtkWidget*) node->Data(); + GtkWidget *button = (GtkWidget*) node->GetData(); gtk_widget_grab_focus( button ); @@ -180,7 +180,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, return FALSE; } - m_widget = gtk_frame_new( title.mbc_str() ); + m_widget = gtk_frame_new( wxGTK_CONV( title ) ); // majorDim may be 0 if all trailing parameters were omitted, so don't // assert here but just use the correct value for it @@ -202,7 +202,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, label += *pc; } - m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) ); + m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) ); gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event", GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this ); @@ -260,12 +260,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, wxRadioBox::~wxRadioBox() { - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); gtk_widget_destroy( button ); - node = node->Next(); + node = node->GetNext(); } } @@ -314,10 +314,10 @@ wxSize wxRadioBox::LayoutItems() y = 15; int max_len = 0; - wxNode *node = m_boxes.Nth( j*num_of_rows ); + wxNode *node = m_boxes.Item( j*num_of_rows ); for (int i1 = 0; i1< num_of_rows; i1++) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); GtkRequisition req; req.width = 2; @@ -330,20 +330,20 @@ wxSize wxRadioBox::LayoutItems() gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); y += req.height; - node = node->Next(); + node = node->GetNext(); if (!node) break; } // we don't know the max_len before - node = m_boxes.Nth( j*num_of_rows ); + node = m_boxes.Item( j*num_of_rows ); for (int i2 = 0; i2< num_of_rows; i2++) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 ); - node = node->Next(); + node = node->GetNext(); if (!node) break; } @@ -359,10 +359,10 @@ wxSize wxRadioBox::LayoutItems() { int max = 0; - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); GtkRequisition req; req.width = 2; @@ -372,18 +372,18 @@ wxSize wxRadioBox::LayoutItems() if (req.width > max) max = req.width; - node = node->Next(); + node = node->GetNext(); } - node = m_boxes.First(); + node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); x += max; - node = node->Next(); + node = node->GetNext(); } res.x = x+4; res.y = 40; @@ -405,35 +405,40 @@ bool wxRadioBox::Show( bool show ) if ((m_windowStyle & wxNO_BORDER) != 0) gtk_widget_hide( m_widget ); - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); if (show) gtk_widget_show( button ); else gtk_widget_hide( button ); - node = node->Next(); + node = node->GetNext(); } return TRUE; } -int wxRadioBox::FindString( const wxString &s ) const +int wxRadioBox::FindString( const wxString &find ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); int count = 0; - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->Data() ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); +#ifdef __WXGTK20__ + wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); +#else + wxString str( label->label ); +#endif + if (find == str) + return count; - GtkLabel *label = GTK_LABEL( button->child ); - if (s == label->label) return count; count++; - node = node->Next(); + node = node->GetNext(); } return -1; @@ -445,29 +450,28 @@ void wxRadioBox::SetFocus() if (m_boxes.GetCount() == 0) return; - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); if (button->active) { gtk_widget_grab_focus( GTK_WIDGET(button) ); return; } - node = node->Next(); + node = node->GetNext(); } - } void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( n ); + wxNode *node = m_boxes.Item( n ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); GtkDisableEvents(); @@ -482,13 +486,13 @@ int wxRadioBox::GetSelection(void) const int count = 0; - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); if (button->active) return count; count++; - node = node->Next(); + node = node->GetNext(); } wxFAIL_MSG( wxT("wxRadioBox none selected") ); @@ -500,14 +504,19 @@ wxString wxRadioBox::GetString( int n ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( n ); + wxNode *node = m_boxes.Item( n ); wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *label = GTK_LABEL( button->child ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); + +#ifdef __WXGTK20__ + wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); +#else + wxString str( label->label ); +#endif - return wxString( label->label ); + return str; } void wxRadioBox::SetLabel( const wxString& label ) @@ -516,21 +525,20 @@ void wxRadioBox::SetLabel( const wxString& label ) wxControl::SetLabel( label ); - gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() ); + gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) ); } void wxRadioBox::SetString( int item, const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxNode *node = m_boxes.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *g_label = GTK_LABEL( button->child ); + GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); - gtk_label_set( g_label, label.mbc_str() ); + gtk_label_set( g_label, wxGTK_CONV( label ) ); } bool wxRadioBox::Enable( bool enable ) @@ -538,14 +546,15 @@ bool wxRadioBox::Enable( bool enable ) if ( !wxControl::Enable( enable ) ) return FALSE; - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkWidget *label = button->child; + GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); + gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); - gtk_widget_set_sensitive( label, enable ); - node = node->Next(); + gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); + node = node->GetNext(); } return TRUE; @@ -555,25 +564,26 @@ void wxRadioBox::Enable( int item, bool enable ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxNode *node = m_boxes.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkWidget *label = button->child; + GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); + gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); - gtk_widget_set_sensitive( label, enable ); + gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); } void wxRadioBox::Show( int item, bool show ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxNode *node = m_boxes.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); if (show) gtk_widget_show( button ); @@ -585,16 +595,22 @@ wxString wxRadioBox::GetStringSelection() const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); if (button->active) { - GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child ); - return label->label; + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); + +#ifdef __WXGTK20__ + wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); +#else + wxString str( label->label ); +#endif + return str; } - node = node->Next(); + node = node->GetNext(); } wxFAIL_MSG( wxT("wxRadioBox none selected") ); @@ -614,7 +630,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s ) int wxRadioBox::GetCount() const { - return m_boxes.Number(); + return m_boxes.GetCount(); } int wxRadioBox::GetNumberOfRowsOrCols() const @@ -629,25 +645,25 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) void wxRadioBox::GtkDisableEvents() { - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()), + gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()), GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - node = node->Next(); + node = node->GetNext(); } } void wxRadioBox::GtkEnableEvents() { - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked", + gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked", GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - node = node->Next(); + node = node->GetNext(); } } @@ -657,28 +673,27 @@ void wxRadioBox::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->Data() ); + GtkWidget *widget = GTK_WIDGET( node->GetData() ); gtk_widget_set_style( widget, m_widgetStyle ); - GtkButton *button = GTK_BUTTON( node->Data() ); - gtk_widget_set_style( button->child, m_widgetStyle ); + gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle ); - node = node->Next(); + node = node->GetNext(); } } #if wxUSE_TOOLTIPS void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->Data() ); + GtkWidget *widget = GTK_WIDGET( node->GetData() ); gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); - node = node->Next(); + node = node->GetNext(); } } #endif // wxUSE_TOOLTIPS @@ -687,14 +702,14 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { if (window == m_widget->window) return TRUE; - wxNode *node = m_boxes.First(); + wxNode *node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); if (window == button->window) return TRUE; - node = node->Next(); + node = node->GetNext(); } return FALSE; @@ -712,6 +727,15 @@ void wxRadioBox::OnInternalIdle() (void)GetEventHandler()->ProcessEvent( event ); } + + if (g_delayedFocus == this) + { + if (GTK_WIDGET_REALIZED(m_widget)) + { + g_delayedFocus = NULL; + SetFocus(); + } + } } #endif // wxUSE_RADIOBOX