#include "wx/gtk/win_gtk.h"
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
if (!rb->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
+ if ( ((gdk_event->keyval == GDK_Tab) ||
+ (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
+ rb->GetParent() && (rb->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
+ {
+ wxNavigationKeyEvent new_event;
+ new_event.SetEventObject( rb->GetParent() );
+ // GDK reports GDK_ISO_Left_Tab for SHIFT-TAB
+ new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
+ // CTRL-TAB changes the (parent) window, i.e. switch notebook page
+ new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
+ new_event.SetCurrentFocus( rb );
+ return rb->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+ }
+
if ((gdk_event->keyval != GDK_Up) &&
(gdk_event->keyval != GDK_Down) &&
(gdk_event->keyval != GDK_Left) &&
return FALSE;
}
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+ g_signal_stop_emission_by_name (widget, "key_press_event");
if ((gdk_event->keyval == GDK_Up) ||
(gdk_event->keyval == GDK_Left))
return false;
}
- m_widget = gtk_frame_new( wxGTK_CONV( title ) );
+ m_widget = GTKCreateFrame(title);
+ wxControl::SetLabel(title);
// majorDim may be 0 if all trailing parameters were omitted, so don't
// assert here but just use the correct value for it
SetMajorDim(majorDim == 0 ? n : majorDim, style);
- int num_of_cols = GetColumnCount();
- int num_of_rows = GetRowCount();
+ unsigned int num_of_cols = GetColumnCount();
+ unsigned int num_of_rows = GetRowCount();
GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
wxString label;
GSList *radio_button_group = (GSList *) NULL;
- for (int i = 0; i < n; i++)
+ for (unsigned int i = 0; i < n; i++)
{
if ( i != 0 )
- radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+ radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(m_radio) );
label.Empty();
for ( const wxChar *pc = choices[i]; *pc; pc++ )
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 );
+ g_signal_connect (m_radio, "key_press_event",
+ G_CALLBACK (gtk_radiobox_keypress_callback), this);
m_boxes.Append( (wxObject*) m_radio );
ConnectWidget( GTK_WIDGET(m_radio) );
- 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 );
+ if (!i)
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_radio), TRUE );
- 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 );
+ g_signal_connect (m_radio, "clicked",
+ G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+ g_signal_connect (m_radio, "focus_in_event",
+ G_CALLBACK (gtk_radiobutton_focus_in), this);
+ g_signal_connect (m_radio, "focus_out_event",
+ G_CALLBACK (gtk_radiobutton_focus_out), this);
}
m_parent->DoAddChild( this );
- SetLabel( title );
-
PostCreation(size);
return true;
return wxNOT_FOUND;
}
-wxString wxRadioBox::GetString( int n ) const
+wxString wxRadioBox::GetString(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
- GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+ GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child);
-#ifdef __WXGTK20__
wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
- wxString str( label->label );
-#endif
return str;
}
{
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") );
wxCHECK_RET( node, wxT("radiobox wrong index") );
- GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
+ GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child);
- gtk_label_set( g_label, wxGTK_CONV( label ) );
+ gtk_label_set_text( g_label, wxGTK_CONV( label ) );
}
bool wxRadioBox::Enable( bool enable )
while (node)
{
GtkButton *button = GTK_BUTTON( node->GetData() );
- GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+ GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
return true;
}
-bool wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable(unsigned int item, bool enable)
{
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->GetData() );
- GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+ GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
return true;
}
-bool wxRadioBox::IsItemEnabled(int item) const
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
{
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button));
}
-bool wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::Show(unsigned int item, bool show)
{
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
return true;
}
-bool wxRadioBox::IsItemShown(int item) const
+bool wxRadioBox::IsItemShown(unsigned int item) const
{
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));
}
-int wxRadioBox::GetCount() const
+unsigned int wxRadioBox::GetCount() const
{
return m_boxes.GetCount();
}
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 );
+ g_signal_handlers_disconnect_by_func (node->GetData(),
+ (gpointer) gtk_radiobutton_clicked_callback,
+ this);
node = node->GetNext();
}
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 );
+ g_signal_connect (node->GetData(), "clicked",
+ G_CALLBACK (gtk_radiobutton_clicked_callback), this);
node = node->GetNext();
}
void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
- gtk_widget_modify_style( m_widget, style );
-
-#ifdef __WXGTK20__
- gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
-#endif
+ GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
GtkWidget *widget = GTK_WIDGET( node->GetData() );
gtk_widget_modify_style( widget, style );
- gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
+ gtk_widget_modify_style(GTK_BIN(widget)->child, style);
node = node->GetNext();
}
}
+bool wxRadioBox::GTKWidgetNeedsMnemonic() const
+{
+ return true;
+}
+
+void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+ GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w);
+}
+
#if wxUSE_TOOLTIPS
void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
{
projects / wxWidgets.git / blobdiff