X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..a83ea9c15a7ac7bbdc6686164cfcbbc21ae5031a:/src/gtk1/radiobox.cpp?ds=sidebyside diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 5bc55111c2..f5779a8936 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -7,11 +7,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_RADIOBOX @@ -80,7 +81,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return FALSE; } - wxNode *node = rb->m_boxes.Find( (wxObject*) widget ); + wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget ); if (!node) { return FALSE; @@ -91,20 +92,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 ); @@ -167,6 +168,19 @@ void wxRadioBox::Init() 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, const wxPoint &pos, const wxSize &size, int n, const wxString choices[], int majorDim, @@ -229,43 +243,28 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, m_parent->DoAddChild( this ); - PostCreation(); - - ApplyWidgetStyle(); + bool wasShown = IsShown(); + if ( wasShown ) + Hide(); // prevent PostCreation() from showing us SetLabel( title ); - SetFont( parent->GetFont() ); - - wxSize ls = LayoutItems(); - - 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 > ls.x) ls.x = req.width; - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = ls.x; - if (newSize.y == -1) newSize.y = ls.y; - SetSize( newSize.x, newSize.y ); + PostCreation(size); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - - Show( TRUE ); + if ( wasShown ) + Show(); 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(); } } @@ -273,25 +272,35 @@ void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { wxWindow::DoSetSize( x, y, width, height, sizeFlags ); - LayoutItems(); + 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( wxT("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; int num_of_cols = 0; int num_of_rows = 0; @@ -305,45 +314,50 @@ wxSize wxRadioBox::LayoutItems() num_of_cols = num_per_major; num_of_rows = m_majorDim; } - + + 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_of_rows ); + 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() ); + 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 ); - + if (req.width > max_len) max_len = req.width; - gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); + if ( !justCalc ) + 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 ); + if ( !justCalc ) + gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight ); - node = node->Next(); + node = node->GetNext(); if (!node) break; } @@ -359,10 +373,10 @@ wxSize wxRadioBox::LayoutItems() { int max = 0; - 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() ); GtkRequisition req; req.width = 2; @@ -372,18 +386,19 @@ 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 ); + 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 = 40; @@ -402,17 +417,17 @@ bool wxRadioBox::Show( bool show ) 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; @@ -424,10 +439,10 @@ int wxRadioBox::FindString( const wxString &find ) const int count = 0; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); #ifdef __WXGTK20__ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); #else @@ -438,7 +453,7 @@ int wxRadioBox::FindString( const wxString &find ) const count++; - node = node->Next(); + node = node->GetNext(); } return -1; @@ -450,16 +465,16 @@ void wxRadioBox::SetFocus() 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(); } } @@ -467,11 +482,11 @@ void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( n ); + wxList::compatibility_iterator 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(); @@ -486,13 +501,13 @@ int wxRadioBox::GetSelection(void) const 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( wxT("wxRadioBox none selected") ); @@ -504,11 +519,11 @@ wxString wxRadioBox::GetString( int n ) const { 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, wxT(""), wxT("radiobox wrong index") ); - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); #ifdef __WXGTK20__ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); @@ -532,11 +547,11 @@ void wxRadioBox::SetString( int item, const wxString& label ) { 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, wxT("radiobox wrong index") ); - GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->Data()) ); + GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); gtk_label_set( g_label, wxGTK_CONV( label ) ); } @@ -546,15 +561,15 @@ bool wxRadioBox::Enable( bool enable ) if ( !wxControl::Enable( enable ) ) return FALSE; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->Data() ); + 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( GTK_WIDGET(label), enable ); - node = node->Next(); + node = node->GetNext(); } return TRUE; @@ -564,11 +579,11 @@ void wxRadioBox::Enable( int item, bool enable ) { 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, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); + GtkButton *button = GTK_BUTTON( node->GetData() ); GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); @@ -579,11 +594,11 @@ void wxRadioBox::Show( int item, bool show ) { 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, wxT("radiobox wrong index") ); - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); if (show) gtk_widget_show( button ); @@ -595,13 +610,13 @@ wxString wxRadioBox::GetStringSelection() const { 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( BUTTON_CHILD(node->Data()) ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); #ifdef __WXGTK20__ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); @@ -610,7 +625,7 @@ wxString wxRadioBox::GetStringSelection() const #endif return str; } - node = node->Next(); + node = node->GetNext(); } wxFAIL_MSG( wxT("wxRadioBox none selected") ); @@ -630,7 +645,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s ) int wxRadioBox::GetCount() const { - return m_boxes.Number(); + return m_boxes.GetCount(); } int wxRadioBox::GetNumberOfRowsOrCols() const @@ -645,55 +660,57 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) void wxRadioBox::GtkDisableEvents() { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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(); + wxList::compatibility_iterator 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(); } } -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_set_style( BUTTON_CHILD(node->Data()), m_widgetStyle ); + gtk_widget_modify_style( widget, style ); + gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style ); - node = node->Next(); + node = node->GetNext(); } } #if wxUSE_TOOLTIPS void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator 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 @@ -702,14 +719,14 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { 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; - node = node->Next(); + node = node->GetNext(); } return FALSE; @@ -738,5 +755,19 @@ void wxRadioBox::OnInternalIdle() } } +// 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; +} + #endif // wxUSE_RADIOBOX