X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..8535af00e277ee89c877e9cb3ac357791119f497:/src/gtk1/radiobox.cpp?ds=sidebyside diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index b1ecb3fc79..352ec74493 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -18,8 +18,10 @@ #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" //----------------------------------------------------------------------------- @@ -33,7 +35,7 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // "clicked" @@ -61,16 +63,63 @@ 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() { } @@ -88,7 +137,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG( T("wxRadioBox creation failed") ); + wxFAIL_MSG( wxT("wxRadioBox creation failed") ); return FALSE; } @@ -108,12 +157,15 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, label.Empty(); for ( const wxChar *pc = choices[i]; *pc; pc++ ) { - if ( *pc != T('&') ) + 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) ); @@ -121,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_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; @@ -135,15 +197,8 @@ 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->DoAddChild( this ); - - PostCreation(); - - SetLabel( title ); - SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -161,11 +216,11 @@ wxRadioBox::~wxRadioBox() } } -void wxRadioBox::OnSize( wxSizeEvent &event ) +void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { + wxWindow::DoSetSize( x, y, width, height, sizeFlags ); + LayoutItems(); - - event.Skip(); } wxSize wxRadioBox::LayoutItems() @@ -176,7 +231,7 @@ wxSize wxRadioBox::LayoutItems() if ( m_majorDim == 0 ) { // avoid dividing by 0 below - wxFAIL_MSG( T("dimension of radiobox should not be 0!") ); + wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") ); m_majorDim = 1; } @@ -215,7 +270,7 @@ 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 ); + gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); y += 22; node = node->Next(); @@ -229,7 +284,7 @@ wxSize wxRadioBox::LayoutItems() { 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; @@ -265,7 +320,7 @@ 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(); @@ -279,9 +334,13 @@ 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) gtk_widget_hide( m_widget ); @@ -301,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; @@ -322,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; @@ -333,7 +392,6 @@ void wxRadioBox::SetFocus() if (button->active) { gtk_widget_grab_focus( GTK_WIDGET(button) ); - return; } node = node->Next(); @@ -343,24 +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() ); - DisableEvents(); + GtkDisableEvents(); gtk_toggle_button_set_state( button, 1 ); - EnableEvents(); + 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; @@ -373,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 ); @@ -394,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 ); @@ -410,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 ); @@ -424,7 +482,7 @@ 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.")); } bool wxRadioBox::Enable( bool enable ) @@ -447,11 +505,11 @@ bool wxRadioBox::Enable( bool enable ) 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; @@ -461,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() ); @@ -477,7 +535,7 @@ void wxRadioBox::Show( int item, bool show ) 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) @@ -491,13 +549,13 @@ wxString wxRadioBox::GetStringSelection() 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; @@ -518,10 +576,10 @@ int wxRadioBox::GetNumberOfRowsOrCols() const void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) { - wxFAIL_MSG(T("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); + wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); } -void wxRadioBox::DisableEvents() +void wxRadioBox::GtkDisableEvents() { wxNode *node = m_boxes.First(); while (node) @@ -533,7 +591,7 @@ void wxRadioBox::DisableEvents() } } -void wxRadioBox::EnableEvents() +void wxRadioBox::GtkEnableEvents() { wxNode *node = m_boxes.First(); while (node) @@ -564,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;