X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0351fc91ec11f36961b24440056660dc17b8718..f59ba38691a891db142ca65d976d2521bae70158:/src/gtk1/radiobox.cpp?ds=inline diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index d972100b26..352ec74493 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -12,11 +12,16 @@ #endif #include "wx/radiobox.h" + +#if wxUSE_RADIOBOX + #include "wx/dialog.h" #include "wx/frame.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include + #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -30,7 +35,7 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // "clicked" @@ -40,7 +45,7 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad { if (g_isIdle) wxapp_install_idle_handler(); - if (!rb->HasVMT()) return; + if (!rb->m_hasVMT) return; if (g_blockEventsOnDrag) return; if (rb->m_alreadySent) @@ -58,17 +63,64 @@ 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; + } + + wxNode *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.First()) + node = rb->m_boxes.Last(); + else + node = node->Previous(); + } + else + { + if (node == rb->m_boxes.Last()) + node = rb->m_boxes.First(); + else + node = node->Next(); + } + + GtkWidget *button = (GtkWidget*) node->Data(); + + gtk_widget_grab_focus( button ); + + return TRUE; +} + //----------------------------------------------------------------------------- // wxRadioBox //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) -BEGIN_EVENT_TABLE(wxRadioBox, wxControl) - EVT_SIZE(wxRadioBox::OnSize) -END_EVENT_TABLE() - -wxRadioBox::wxRadioBox(void) +wxRadioBox::wxRadioBox() { } @@ -82,9 +134,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, m_needParent = TRUE; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + 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() ); @@ -92,13 +147,25 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, 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, label.mbc_str() ) ); + + 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 ); ConnectWidget( GTK_WIDGET(m_radio) ); @@ -106,13 +173,23 @@ 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_WIDGET(m_radio), - m_x+10, m_y+10+(i*24), 10, 10 ); + 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(); + + ApplyWidgetStyle(); + + SetLabel( title ); + + SetFont( parent->GetFont() ); + wxSize ls = LayoutItems(); wxSize newSize = size; @@ -120,24 +197,15 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if (newSize.y == -1) newSize.y = ls.y; SetSize( newSize.x, newSize.y ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); - - PostCreation(); - - SetLabel( title ); - SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); Show( TRUE ); return TRUE; } -wxRadioBox::~wxRadioBox(void) +wxRadioBox::~wxRadioBox() { wxNode *node = m_boxes.First(); while (node) @@ -148,10 +216,10 @@ wxRadioBox::~wxRadioBox(void) } } -void wxRadioBox::OnSize( wxSizeEvent &event ) +void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - wxControl::OnSize( event ); - + wxWindow::DoSetSize( x, y, width, height, sizeFlags ); + LayoutItems(); } @@ -160,20 +228,41 @@ 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 ); - if (m_windowStyle & wxRA_HORIZONTAL) + int num_of_cols = 0; + int num_of_rows = 0; + if (HasFlag(wxRA_SPECIFY_COLS)) { - - for (int j = 0; j < m_majorDim; j++) + 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; - wxNode *node = m_boxes.Nth( j*num_per_major ); - for (int i1 = 0; i1< num_per_major; i1++) + wxNode *node = m_boxes.Nth( 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 ); @@ -181,8 +270,8 @@ wxSize wxRadioBox::LayoutItems() int len = 22+gdk_string_measure( font, label->label ); if (len > max_len) max_len = len; - gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y ); - y += 20; + gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); + y += 22; node = node->Next(); if (!node) break; @@ -190,12 +279,12 @@ wxSize wxRadioBox::LayoutItems() // 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.Nth( j*num_of_rows ); + for (int i2 = 0; i2< num_of_rows; i2++) { GtkWidget *button = GTK_WIDGET( node->Data() ); - gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 ); + gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 ); node = node->Next(); if (!node) break; @@ -231,13 +320,13 @@ wxSize wxRadioBox::LayoutItems() { GtkWidget *button = GTK_WIDGET( node->Data() ); - gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); + gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); x += max; node = node->Next(); } res.x = x+4; - res.y = 42; + res.y = 40; } return res; @@ -245,13 +334,17 @@ 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 ((m_windowStyle & wxNO_BORDER) != 0) gtk_widget_hide( m_widget ); - + wxNode *node = m_boxes.First(); while (node) { @@ -267,7 +360,7 @@ bool wxRadioBox::Show( bool show ) int wxRadioBox::FindString( const wxString &s ) const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); int count = 0; @@ -288,7 +381,7 @@ 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; @@ -299,7 +392,6 @@ void wxRadioBox::SetFocus() if (button->active) { gtk_widget_grab_focus( GTK_WIDGET(button) ); - return; } node = node->Next(); @@ -309,20 +401,24 @@ void wxRadioBox::SetFocus() void wxRadioBox::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); wxNode *node = m_boxes.Nth( n ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + wxCHECK_RET( node, wxT("radiobox wrong index") ); GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkDisableEvents(); + 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; @@ -335,18 +431,18 @@ int wxRadioBox::GetSelection(void) const node = node->Next(); } - 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 ); - 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 ); @@ -356,14 +452,14 @@ wxString wxRadioBox::GetString( int n ) const wxString wxRadioBox::GetLabel( int item ) const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); return GetString( item ); } 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 ); @@ -372,11 +468,11 @@ void wxRadioBox::SetLabel( const wxString& label ) void wxRadioBox::SetLabel( 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 ); - 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 ); @@ -386,12 +482,13 @@ void wxRadioBox::SetLabel( int item, const wxString& label ) void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) ) { - wxFAIL_MSG(_T("wxRadioBox::SetLabel not implemented.")); + wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented.")); } -void wxRadioBox::Enable( bool enable ) +bool wxRadioBox::Enable( bool enable ) { - wxControl::Enable( enable ); + if ( !wxControl::Enable( enable ) ) + return FALSE; wxNode *node = m_boxes.First(); while (node) @@ -402,15 +499,17 @@ void wxRadioBox::Enable( bool enable ) gtk_widget_set_sensitive( label, enable ); node = node->Next(); } + + 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") ); wxNode *node = m_boxes.Nth( item ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + wxCHECK_RET( node, wxT("radiobox wrong index") ); GtkButton *button = GTK_BUTTON( node->Data() ); GtkWidget *label = button->child; @@ -420,11 +519,11 @@ void wxRadioBox::Enable( int item, bool 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 ); - wxCHECK_RET( node, _T("radiobox wrong index") ); + wxCHECK_RET( node, wxT("radiobox wrong index") ); GtkWidget *button = GTK_WIDGET( node->Data() ); @@ -434,9 +533,9 @@ 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(); while (node) @@ -450,13 +549,13 @@ wxString wxRadioBox::GetStringSelection(void) const node = node->Next(); } - 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; @@ -465,19 +564,43 @@ bool wxRadioBox::SetStringSelection( const wxString &s ) return TRUE; } -int wxRadioBox::Number(void) const +int wxRadioBox::Number() const { return m_boxes.Number(); } -int wxRadioBox::GetNumberOfRowsOrCols(void) const +int wxRadioBox::GetNumberOfRowsOrCols() const { return 1; } void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) { - wxFAIL_MSG(_T("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); + wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); +} + +void wxRadioBox::GtkDisableEvents() +{ + wxNode *node = m_boxes.First(); + while (node) + { + gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()), + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + node = node->Next(); + } +} + +void wxRadioBox::GtkEnableEvents() +{ + wxNode *node = m_boxes.First(); + while (node) + { + gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked", + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + node = node->Next(); + } } void wxRadioBox::ApplyWidgetStyle() @@ -499,6 +622,19 @@ void wxRadioBox::ApplyWidgetStyle() } } +#if wxUSE_TOOLTIPS +void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) +{ + wxNode *node = m_boxes.First(); + while (node) + { + GtkWidget *widget = GTK_WIDGET( node->Data() ); + gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); + node = node->Next(); + } +} +#endif // wxUSE_TOOLTIPS + bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { if (window == m_widget->window) return TRUE; @@ -515,3 +651,5 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) return FALSE; } + +#endif