X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e717ecc5add075cd53a04cf24fe27e24170944..53e8c532c641ea8285b436990ff6e29ddd8d0443:/src/gtk/radiobox.cpp?ds=sidebyside diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 3e2dc3124c..04050c30dd 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -7,19 +7,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif -#include "wx/radiobox.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_RADIOBOX +#include "wx/radiobox.h" + #include "wx/dialog.h" #include "wx/frame.h" +#include "wx/log.h" + +#include "wx/gtk/private.h" +#include -#include "gdk/gdk.h" -#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -33,26 +38,21 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" //----------------------------------------------------------------------------- -static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb ) +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; - if (rb->m_alreadySent) - { - rb->m_alreadySent = FALSE; - return; - } - - rb->m_alreadySent = TRUE; + if (!button->active) return; wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() ); event.SetInt( rb->GetSelection() ); @@ -61,18 +61,124 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad rb->GetEventHandler()->ProcessEvent(event); } +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- + +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; + + if ((gdk_event->keyval != GDK_Up) && + (gdk_event->keyval != GDK_Down) && + (gdk_event->keyval != GDK_Left) && + (gdk_event->keyval != GDK_Right)) + { + return FALSE; + } + + wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget ); + if (!node) + { + return FALSE; + } + + gtk_signal_emit_stop_by_name( GTK_OBJECT(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(); + else + node = node->GetPrevious(); + } + else + { + if (node == rb->m_boxes.GetLast()) + node = rb->m_boxes.GetFirst(); + else + node = node->GetNext(); + } + + GtkWidget *button = (GtkWidget*) node->GetData(); + + gtk_widget_grab_focus( button ); + + return TRUE; +} + +static gint gtk_radiobutton_focus_in( GtkWidget *widget, + GdkEvent *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 ); + } + + return FALSE; +} + +static gint gtk_radiobutton_focus_out( GtkWidget *widget, + GdkEvent *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; + + return FALSE; +} + //----------------------------------------------------------------------------- // wxRadioBox //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) -BEGIN_EVENT_TABLE(wxRadioBox, wxControl) - EVT_SIZE(wxRadioBox::OnSize) -END_EVENT_TABLE() +void wxRadioBox::Init() +{ + m_needParent = true; + m_acceptsFocus = true; -wxRadioBox::wxRadioBox() + m_hasFocus = + m_lostFocus = false; +} + +bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, + const wxString& title, + const wxPoint &pos, const wxSize &size, + const wxArrayString& choices, int majorDim, + long style, const wxValidator& validator, + const wxString &name ) { + wxCArrayString chs(choices); + + return Create( parent, id, title, pos, size, chs.GetCount(), + chs.GetStrings(), majorDim, style, validator, name ); } bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, @@ -81,28 +187,39 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, long style, const wxValidator& validator, const wxString &name ) { - m_alreadySent = FALSE; - m_needParent = TRUE; - m_acceptsFocus = TRUE; - - PreCreation( parent, id, pos, size, style, name ); - -#if wxUSE_VALIDATORS - SetValidator( validator ); -#endif + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxRadioBox creation failed") ); + return false; + } - m_widget = gtk_frame_new( title.mbc_str() ); + m_widget = gtk_frame_new( wxGTK_CONV( title ) ); - m_majorDim = majorDim; + // majorDim may be 0 if all trailing parameters were omitted, so don't + // assert here but just use the correct value for it + m_majorDim = majorDim == 0 ? n : majorDim; GtkRadioButton *m_radio = (GtkRadioButton*) NULL; + wxString label; GSList *radio_button_group = (GSList *) NULL; for (int i = 0; i < n; i++) { - if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); + if ( i != 0 ) + radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); - m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i].mbc_str() ) ); + label.Empty(); + for ( const wxChar *pc = choices[i]; *pc; pc++ ) + { + if ( *pc != wxT('&') ) + label += *pc; + } + + 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 ); m_boxes.Append( (wxObject*) m_radio ); @@ -111,104 +228,136 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE ); gtk_signal_connect( GTK_OBJECT(m_radio), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), + gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this ); + + gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow), GTK_WIDGET(m_radio), m_x+10, m_y+10+(i*24), 10, 10 ); } - wxSize ls = LayoutItems(); - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = ls.x; - if (newSize.y == -1) newSize.y = ls.y; - SetSize( newSize.x, newSize.y ); - m_parent->DoAddChild( this ); - PostCreation(); + bool wasShown = IsShown(); + if ( wasShown ) + Hide(); // prevent PostCreation() from showing us SetLabel( title ); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + PostCreation(size); - Show( TRUE ); + if ( wasShown ) + Show(); - return TRUE; + return true; } wxRadioBox::~wxRadioBox() { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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(); } } -void wxRadioBox::OnSize( wxSizeEvent &event ) +void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - LayoutItems(); + wxWindow::DoSetSize( x, y, width, height, sizeFlags ); - event.Skip(); + LayoutItems(false); } -wxSize wxRadioBox::LayoutItems() +wxSize wxRadioBox::DoGetBestSize() const { - int x = 7; - int y = 15; + wxSize size = LayoutItems(true); - if ( m_majorDim == 0 ) - { - // avoid dividing by 0 below - wxFAIL_MSG( "dimension of radiobox should not be 0!" ); + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req ); + if (req.width > size.x) + size.x = req.width; - m_majorDim = 1; - } + CacheBestSize(size); + return size; +} + +wxSize wxRadioBox::LayoutItems(bool justCalc) const +{ + wxSize res( 0, 0 ); + + // avoid dividing by 0 below + wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") ); int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1; - wxSize res( 0, 0 ); + int x = 7; + int y = 15; - if (m_windowStyle & wxRA_HORIZONTAL) + int num_of_cols = 0; + int num_of_rows = 0; + if (HasFlag(wxRA_SPECIFY_COLS)) + { + num_of_cols = m_majorDim; + num_of_rows = num_per_major; + } + else { + num_of_cols = num_per_major; + num_of_rows = m_majorDim; + } - for (int j = 0; j < m_majorDim; j++) + int lineheight = GetCharHeight()+2; + + if ( HasFlag(wxRA_SPECIFY_COLS) || + (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) ) + { + for (int j = 0; j < num_of_cols; j++) { - y = 15; + y = 3; + y += lineheight; int max_len = 0; - wxNode *node = m_boxes.Nth( j*num_per_major ); - for (int i1 = 0; i1< num_per_major; i1++) + wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows ); + for (int i1 = 0; i1< num_of_rows; i1++) { - GtkWidget *button = GTK_WIDGET( node->Data() ); - GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child ); - GdkFont *font = m_widget->style->font; - int len = 22+gdk_string_measure( font, label->label ); - if (len > max_len) max_len = len; + GtkWidget *button = GTK_WIDGET( node->GetData() ); + + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request ) + (button, &req ); - gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y ); - y += 22; + if (req.width > max_len) max_len = req.width; - node = node->Next(); + if ( !justCalc ) + gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); + y += req.height; + + node = node->GetNext(); if (!node) break; } // we don't know the max_len before - node = m_boxes.Nth( j*num_per_major ); - for (int i2 = 0; i2< num_per_major; i2++) + 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_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 ); + if ( !justCalc ) + gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight ); - node = node->Next(); + node = node->GetNext(); if (!node) break; } @@ -218,37 +367,41 @@ wxSize wxRadioBox::LayoutItems() } res.x = x+4; - res.y += 9; + res.y += 4; } else { int max = 0; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *label = GTK_LABEL( button->child ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); + + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request ) + (button, &req ); - GdkFont *font = m_widget->style->font; - int len = 22+gdk_string_measure( font, label->label ); - if (len > max) max = len; + 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_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); + if ( !justCalc ) + gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight ); x += max; - node = node->Next(); + node = node->GetNext(); } res.x = x+4; - res.y = 42; + res.y = 40; } return res; @@ -256,42 +409,51 @@ wxSize wxRadioBox::LayoutItems() bool wxRadioBox::Show( bool show ) { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxWindow::Show( show ); + if (!wxControl::Show(show)) + { + // nothing to do + return false; + } - if ((m_windowStyle & wxNO_BORDER) != 0) + if ( HasFlag(wxNO_BORDER) ) gtk_widget_hide( m_widget ); - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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; + return true; } -int wxRadioBox::FindString( const wxString &s ) const +int wxRadioBox::FindString( const wxString &find ) const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); int count = 0; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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; @@ -299,148 +461,144 @@ int wxRadioBox::FindString( const wxString &s ) const void wxRadioBox::SetFocus() { - wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); if (m_boxes.GetCount() == 0) return; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + + wxList::compatibility_iterator node = m_boxes.Item( n ); + + wxCHECK_RET( node, wxT("radiobox wrong index") ); - wxNode *node = m_boxes.Nth( n ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + GtkDisableEvents(); - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + gtk_toggle_button_set_active( button, 1 ); - gtk_toggle_button_set_state( button, 1 ); + GtkEnableEvents(); } int wxRadioBox::GetSelection(void) const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); int count = 0; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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( _T("wxRadioBox none selected") ); + wxFAIL_MSG( wxT("wxRadioBox none selected") ); return -1; } wxString wxRadioBox::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( n ); + wxList::compatibility_iterator node = m_boxes.Item( n ); - wxCHECK_MSG( node, _T(""), _T("radiobox wrong index") ); + wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *label = GTK_LABEL( button->child ); - - return wxString( label->label ); -} + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); -wxString wxRadioBox::GetLabel( int item ) const -{ - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); +#ifdef __WXGTK20__ + wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); +#else + wxString str( label->label ); +#endif - return GetString( item ); + return str; } void wxRadioBox::SetLabel( const wxString& label ) { - wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); 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::SetLabel( int item, const wxString& label ) +void wxRadioBox::SetString( int item, const wxString& label ) { - wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *g_label = GTK_LABEL( button->child ); - - gtk_label_set( g_label, label.mbc_str() ); -} + GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); -void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) ) -{ - wxFAIL_MSG(_T("wxRadioBox::SetLabel not implemented.")); + gtk_label_set( g_label, wxGTK_CONV( label ) ); } bool wxRadioBox::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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; + return true; } void wxRadioBox::Enable( int item, bool enable ) { - wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + + wxList::compatibility_iterator node = m_boxes.Item( item ); - wxNode *node = m_boxes.Nth( item ); + wxCHECK_RET( node, wxT("radiobox wrong index") ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkWidget *label = button->child; 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, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + 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 ); @@ -448,86 +606,177 @@ void wxRadioBox::Show( int item, bool show ) gtk_widget_hide( button ); } -wxString wxRadioBox::GetStringSelection(void) const +wxString wxRadioBox::GetStringSelection() const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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( _T("wxRadioBox none selected") ); - return _T(""); + wxFAIL_MSG( wxT("wxRadioBox none selected") ); + return wxT(""); } bool wxRadioBox::SetStringSelection( const wxString &s ) { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); int res = FindString( s ); - if (res == -1) return FALSE; + if (res == -1) return false; SetSelection( res ); - return TRUE; + return true; } -int wxRadioBox::Number(void) const +int wxRadioBox::GetCount() const { - return m_boxes.Number(); + return m_boxes.GetCount(); } -int wxRadioBox::GetNumberOfRowsOrCols(void) const +void wxRadioBox::GtkDisableEvents() { - return 1; + wxList::compatibility_iterator node = m_boxes.GetFirst(); + while (node) + { + gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()), + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + node = node->GetNext(); + } } -void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) +void wxRadioBox::GtkEnableEvents() { - wxFAIL_MSG(_T("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); + wxList::compatibility_iterator node = m_boxes.GetFirst(); + while (node) + { + gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked", + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + node = node->GetNext(); + } } -void wxRadioBox::ApplyWidgetStyle() +void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); + gtk_widget_modify_style( m_widget, style ); - gtk_widget_set_style( m_widget, m_widgetStyle ); +#ifdef __WXGTK20__ + gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style); +#endif - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->Data() ); - gtk_widget_set_style( widget, m_widgetStyle ); + GtkWidget *widget = GTK_WIDGET( node->GetData() ); + + gtk_widget_modify_style( widget, style ); + gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style ); - GtkButton *button = GTK_BUTTON( node->Data() ); - gtk_widget_set_style( button->child, m_widgetStyle ); + node = node->GetNext(); + } +} - node = node->Next(); +#if wxUSE_TOOLTIPS +void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) +{ + wxList::compatibility_iterator node = m_boxes.GetFirst(); + while (node) + { + GtkWidget *widget = GTK_WIDGET( node->GetData() ); + gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); + node = node->GetNext(); } } +#endif // wxUSE_TOOLTIPS bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return TRUE; + if (window == m_widget->window) return true; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (window == button->window) return TRUE; + if (window == button->window) return true; - node = node->Next(); + node = node->GetNext(); } - return FALSE; + return false; } -#endif +void wxRadioBox::OnInternalIdle() +{ + if ( m_lostFocus ) + { + m_hasFocus = false; + m_lostFocus = false; + + wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); + event.SetEventObject( this ); + + (void)GetEventHandler()->ProcessEvent( event ); + } + + if (g_delayedFocus == this) + { + if (GTK_WIDGET_REALIZED(m_widget)) + { + g_delayedFocus = NULL; + SetFocus(); + } + } +} + +// static +wxVisualAttributes +wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + wxVisualAttributes attr; + // NB: we need toplevel window so that GTK+ can find the right style + GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); + GtkWidget* widget = gtk_radio_button_new_with_label(NULL, ""); + gtk_container_add(GTK_CONTAINER(wnd), widget); + attr = GetDefaultAttributesFromGTKWidget(widget); + gtk_widget_destroy(wnd); + return attr; +} + +#if WXWIN_COMPATIBILITY_2_2 + +int wxRadioBox::Number() const +{ + return GetCount(); +} + +wxString wxRadioBox::GetLabel(int n) const +{ + return GetString(n); +} + +void wxRadioBox::SetLabel( int item, const wxString& label ) +{ + SetString(item, label); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + +#endif // wxUSE_RADIOBOX +