X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..a5de860f0b8994b2d87d0a0d3c3dedf750fa7ddb:/src/gtk1/radiobox.cpp diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 7463243d03..2f760c38cf 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp +// Name: src/gtk1/radiobox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "radiobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -18,14 +14,16 @@ #include "wx/radiobox.h" -#include "wx/dialog.h" -#include "wx/frame.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/dialog.h" +#endif -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // idle system @@ -45,6 +43,7 @@ extern wxWindowGTK *g_delayedFocus; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -60,11 +59,13 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo event.SetEventObject( rb ); rb->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // "key_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb ) { if (g_isIdle) @@ -111,7 +112,9 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return TRUE; } +} +extern "C" { static gint gtk_radiobutton_focus_in( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxRadioBox *win ) @@ -123,7 +126,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, } else if ( !win->m_hasFocus ) { - win->m_hasFocus = TRUE; + win->m_hasFocus = true; wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); event.SetEventObject( win ); @@ -135,7 +138,9 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, return FALSE; } +} +extern "C" { static gint gtk_radiobutton_focus_out( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxRadioBox *win ) @@ -147,11 +152,12 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget, // 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; + // idle iteration (leave m_hasFocus == true for now) + win->m_lostFocus = true; return FALSE; } +} //----------------------------------------------------------------------------- // wxRadioBox @@ -161,11 +167,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) void wxRadioBox::Init() { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_needParent = true; + m_acceptsFocus = true; m_hasFocus = - m_lostFocus = FALSE; + m_lostFocus = false; } bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, @@ -191,17 +197,33 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxRadioBox creation failed") ); - return FALSE; + return false; } - m_widget = gtk_frame_new( wxGTK_CONV( title ) ); + m_widget = gtk_frame_new(NULL); + 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 - m_majorDim = majorDim == 0 ? n : majorDim; + SetMajorDim(majorDim == 0 ? n : majorDim, style); + + + unsigned int num_of_cols = GetColumnCount(); + unsigned int num_of_rows = GetRowCount(); GtkRadioButton *m_radio = (GtkRadioButton*) NULL; + GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE ); + gtk_table_set_col_spacings( GTK_TABLE(table), 1 ); + gtk_table_set_row_spacings( GTK_TABLE(table), 1 ); + gtk_widget_show( table ); + gtk_container_add( GTK_CONTAINER(m_widget), table ); + wxString label; GSList *radio_button_group = (GSList *) NULL; for (int i = 0; i < n; i++) @@ -217,12 +239,32 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, } m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) ); + gtk_widget_show( GTK_WIDGET(m_radio) ); 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 ); + if (HasFlag(wxRA_SPECIFY_COLS)) + { + int left = i%num_of_cols; + int right = (i%num_of_cols) + 1; + int top = i/num_of_cols; + int bottom = (i/num_of_cols)+1; + gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, + GTK_FILL, GTK_FILL, 1, 1 ); + } + else + { + int left = i/num_of_rows; + int right = (i/num_of_rows) + 1; + int top = i%num_of_rows; + int bottom = (i%num_of_rows)+1; + gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, + GTK_FILL, GTK_FILL, 1, 1 ); + } + ConnectWidget( GTK_WIDGET(m_radio) ); if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE ); @@ -235,39 +277,13 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, 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 ); } m_parent->DoAddChild( this ); - PostCreation(); - InheritAttributes(); - - ApplyWidgetStyle(); - - SetLabel( title ); - - SetFont( parent->GetFont() ); - - wxSize ls = LayoutItems(); + PostCreation(size); - 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 ); - - Show( TRUE ); - - return TRUE; + return true; } wxRadioBox::~wxRadioBox() @@ -281,140 +297,17 @@ wxRadioBox::~wxRadioBox() } } -void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) +bool wxRadioBox::Show(bool show) { - wxWindow::DoSetSize( x, y, width, height, sizeFlags ); - - LayoutItems(); -} - -wxSize wxRadioBox::LayoutItems() -{ - int x = 7; - int y = 15; - - if ( m_majorDim == 0 ) - { - // avoid dividing by 0 below - wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") ); - - m_majorDim = 1; - } - - int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1; - - wxSize res( 0, 0 ); - - 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; - } - - if ( HasFlag(wxRA_SPECIFY_COLS) || - (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) ) - { - for (int j = 0; j < num_of_cols; j++) - { - y = 15; - - int max_len = 0; - 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->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 ); - y += req.height; - - node = node->GetNext(); - if (!node) break; - } - - // we don't know the max_len before - - node = m_boxes.Item( j*num_of_rows ); - for (int i2 = 0; i2< num_of_rows; i2++) - { - GtkWidget *button = GTK_WIDGET( node->GetData() ); - - gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 ); - - node = node->GetNext(); - if (!node) break; - } - - if (y > res.y) res.y = y; - - x += max_len + 2; - } - - res.x = x+4; - res.y += 4; - } - else - { - int max = 0; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - 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) max = req.width; - - node = node->GetNext(); - } - - node = m_boxes.GetFirst(); - while (node) - { - 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->GetNext(); - } - res.x = x+4; - res.y = 40; - } - - return res; -} - -bool wxRadioBox::Show( bool show ) -{ - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); if (!wxControl::Show(show)) { // nothing to do - return FALSE; + return false; } - if ((m_windowStyle & wxNO_BORDER) != 0) + if ( HasFlag(wxNO_BORDER) ) gtk_widget_hide( m_widget ); wxList::compatibility_iterator node = m_boxes.GetFirst(); @@ -422,38 +315,15 @@ bool wxRadioBox::Show( bool show ) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (show) gtk_widget_show( button ); else gtk_widget_hide( button ); - - node = node->GetNext(); - } - - return TRUE; -} - -int wxRadioBox::FindString( const wxString &find ) const -{ - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); - - int count = 0; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - 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; - - count++; + if (show) + gtk_widget_show( button ); + else + gtk_widget_hide( button ); node = node->GetNext(); } - return -1; + return true; } void wxRadioBox::SetFocus() @@ -494,7 +364,7 @@ void wxRadioBox::SetSelection( int n ) int wxRadioBox::GetSelection(void) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") ); int count = 0; @@ -509,24 +379,20 @@ int wxRadioBox::GetSelection(void) const wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return -1; + return wxNOT_FOUND; } -wxString wxRadioBox::GetString( int n ) const +wxString wxRadioBox::GetString(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); wxList::compatibility_iterator node = m_boxes.Item( n ); - wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") ); + wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") ); 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; } @@ -535,12 +401,10 @@ void wxRadioBox::SetLabel( const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxControl::SetLabel( label ); - - gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) ); + GTKSetLabelForFrame(GTK_FRAME(m_widget), label); } -void wxRadioBox::SetString( int item, const wxString& label ) +void wxRadioBox::SetString(unsigned int item, const wxString& label) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -556,7 +420,7 @@ void wxRadioBox::SetString( int item, const wxString& label ) bool wxRadioBox::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) @@ -569,90 +433,75 @@ bool wxRadioBox::Enable( bool enable ) node = node->GetNext(); } - return TRUE; + return true; } -void wxRadioBox::Enable( int item, bool enable ) +bool wxRadioBox::Enable(unsigned int item, bool enable) { - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, wxT("radiobox wrong index") ); + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); 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 ); + + return true; } -void wxRadioBox::Show( int item, bool show ) +bool wxRadioBox::IsItemEnabled(unsigned int item) const { - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, wxT("radiobox wrong index") ); + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData() ); - if (show) - gtk_widget_show( button ); - else - gtk_widget_hide( button ); + // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if + // the parent radiobox is disabled + return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button)); } -wxString wxRadioBox::GetStringSelection() const +bool wxRadioBox::Show(unsigned int item, bool show) { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); - if (button->active) - { - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); + wxList::compatibility_iterator node = m_boxes.Item( item ); -#ifdef __WXGTK20__ - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif - return str; - } - node = node->GetNext(); - } + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return wxT(""); + GtkWidget *button = GTK_WIDGET( node->GetData() ); + + if (show) + gtk_widget_show( button ); + else + gtk_widget_hide( button ); + + return true; } -bool wxRadioBox::SetStringSelection( const wxString &s ) +bool wxRadioBox::IsItemShown(unsigned int item) const { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - int res = FindString( s ); - if (res == -1) return FALSE; - SetSelection( res ); + wxList::compatibility_iterator node = m_boxes.Item( item ); - return TRUE; -} + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); -int wxRadioBox::GetCount() const -{ - return m_boxes.GetCount(); -} + GtkButton *button = GTK_BUTTON( node->GetData() ); -int wxRadioBox::GetNumberOfRowsOrCols() const -{ - return 1; + return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } -void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) +unsigned int wxRadioBox::GetCount() const { - wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); + return m_boxes.GetCount(); } void wxRadioBox::GtkDisableEvents() @@ -679,19 +528,17 @@ void wxRadioBox::GtkEnableEvents() } } -void wxRadioBox::ApplyWidgetStyle() +void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - - gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_widget_modify_style( m_widget, style ); wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { GtkWidget *widget = GTK_WIDGET( node->GetData() ); - gtk_widget_set_style( widget, m_widgetStyle ); - gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle ); + gtk_widget_modify_style( widget, style ); + gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style ); node = node->GetNext(); } @@ -712,27 +559,29 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return TRUE; + 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; + if (window == button->window) + return true; node = node->GetNext(); } - return FALSE; + return false; } void wxRadioBox::OnInternalIdle() { if ( m_lostFocus ) { - m_hasFocus = FALSE; - m_lostFocus = FALSE; + m_hasFocus = false; + m_lostFocus = false; wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); @@ -750,5 +599,18 @@ void wxRadioBox::OnInternalIdle() } } -#endif // wxUSE_RADIOBOX +// 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