#pragma implementation "radiobox.h"
#endif
-#include "wx/radiobox.h"
+#include "wx/defs.h"
#if wxUSE_RADIOBOX
+#include "wx/radiobox.h"
+
#include "wx/dialog.h"
#include "wx/frame.h"
+#include "wx/log.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h>
#include "wx/gtk/win_gtk.h"
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
+extern wxWindowGTK *g_delayedFocus;
//-----------------------------------------------------------------------------
// "clicked"
//-----------------------------------------------------------------------------
-static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
+static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
- if (rb->m_alreadySent)
- {
- rb->m_alreadySent = FALSE;
- return;
- }
-
- rb->m_alreadySent = TRUE;
+ if (!button->active) return;
wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
event.SetInt( rb->GetSelection() );
{
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();
+ 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();
+ node = rb->m_boxes.First();
+ else
+ node = node->Next();
}
-
+
GtkWidget *button = (GtkWidget*) node->Data();
-
+
gtk_widget_grab_focus( button );
-
+
return TRUE;
}
GdkEvent *WXUNUSED(event),
wxRadioBox *win )
{
- wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+ // wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+ // Replace with a warning, else we dump core a lot!
+ // if (!win->m_hasFocus)
+ // wxLogWarning(_T("Radiobox got focus out without any focus in.") );
// 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
void wxRadioBox::Init()
{
- m_alreadySent = FALSE;
m_needParent = TRUE;
m_acceptsFocus = TRUE;
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxRadioBox creation failed") );
- return FALSE;
+ return FALSE;
}
m_widget = gtk_frame_new( title.mbc_str() );
- m_majorDim = majorDim;
+ // 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;
GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
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) );
m_parent->DoAddChild( this );
PostCreation();
-
+
ApplyWidgetStyle();
SetLabel( title );
GtkRequisition req;
req.width = 2;
req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+ (* 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;
void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-
+
LayoutItems();
}
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 i1 = 0; i1< num_of_rows; i1++)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
-
+
GtkRequisition req;
req.width = 2;
req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+ (* 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 );
GtkRequisition req;
req.width = 2;
req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+ (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
(button, &req );
if (req.width > max) max = req.width;
wxNode *node = m_boxes.First();
while (node)
{
- GtkButton *button = GTK_BUTTON( node->Data() );
+ GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+ if (s == label->label)
+ return count;
- GtkLabel *label = GTK_LABEL( button->child );
- if (s == label->label) return count;
count++;
node = node->Next();
}
node = node->Next();
}
-
}
void wxRadioBox::SetSelection( int n )
GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
GtkDisableEvents();
-
- gtk_toggle_button_set_state( button, 1 );
-
+
+ gtk_toggle_button_set_active( button, 1 );
+
GtkEnableEvents();
}
wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
- GtkButton *button = GTK_BUTTON( node->Data() );
- GtkLabel *label = GTK_LABEL( button->child );
+ GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
return wxString( label->label );
}
-wxString wxRadioBox::GetLabel( int item ) const
-{
- wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
-
- return GetString( item );
-}
-
void wxRadioBox::SetLabel( const wxString& label )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
}
-void wxRadioBox::SetLabel( int item, const wxString& label )
+void wxRadioBox::SetString( int item, const wxString& label )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxCHECK_RET( node, wxT("radiobox wrong index") );
- GtkButton *button = GTK_BUTTON( node->Data() );
- GtkLabel *g_label = GTK_LABEL( button->child );
+ GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
gtk_label_set( g_label, label.mbc_str() );
}
-void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
-{
- wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
-}
-
bool wxRadioBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
while (node)
{
GtkButton *button = GTK_BUTTON( node->Data() );
- GtkWidget *label = button->child;
+ GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
- gtk_widget_set_sensitive( label, enable );
+ gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
node = node->Next();
}
wxCHECK_RET( node, wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->Data() );
- GtkWidget *label = button->child;
+ GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
- gtk_widget_set_sensitive( label, enable );
+ gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
}
void wxRadioBox::Show( int item, bool show )
GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
if (button->active)
{
- GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
+ GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+
return label->label;
}
node = node->Next();
return TRUE;
}
-int wxRadioBox::Number() const
+int wxRadioBox::GetCount() const
{
return m_boxes.Number();
}
gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
- node = node->Next();
+ node = node->Next();
}
}
gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
- node = node->Next();
+ node = node->Next();
}
}
GtkWidget *widget = GTK_WIDGET( node->Data() );
gtk_widget_set_style( widget, m_widgetStyle );
- GtkButton *button = GTK_BUTTON( node->Data() );
- gtk_widget_set_style( button->child, m_widgetStyle );
+ gtk_widget_set_style( BUTTON_CHILD(node->Data()), m_widgetStyle );
node = node->Next();
}
(void)GetEventHandler()->ProcessEvent( event );
}
+
+ if (g_delayedFocus == this)
+ {
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ g_delayedFocus = NULL;
+ SetFocus();
+ }
+ }
}
#endif // wxUSE_RADIOBOX
projects / wxWidgets.git / blobdiff