#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>
return TRUE;
}
+static gint gtk_radiobutton_focus_in( GtkWidget *widget,
+ GdkEvent *WXUNUSED(event),
+ wxRadioBox *win )
+{
+ if ( win->m_lostFocus )
+ {
+ // no, we didn't really lose it
+ win->m_lostFocus = FALSE;
+ }
+ else if ( !win->m_hasFocus )
+ {
+ win->m_hasFocus = TRUE;
+
+ wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
+ event.SetEventObject( win );
+
+ // never stop the signal emission, it seems to break the kbd handling
+ // inside the radiobox
+ (void)win->GetEventHandler()->ProcessEvent( event );
+ }
+
+ return FALSE;
+}
+
+static gint gtk_radiobutton_focus_out( GtkWidget *widget,
+ GdkEvent *WXUNUSED(event),
+ wxRadioBox *win )
+{
+ // 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
+ // idle iteration (leave m_hasFocus == TRUE for now)
+ win->m_lostFocus = TRUE;
+
+ return FALSE;
+}
+
//-----------------------------------------------------------------------------
// wxRadioBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()
{
+ m_alreadySent = FALSE;
+ m_needParent = TRUE;
+ m_acceptsFocus = TRUE;
+
+ m_hasFocus =
+ m_lostFocus = FALSE;
}
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
long style, const wxValidator& validator,
const wxString &name )
{
- m_alreadySent = FALSE;
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
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), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+ 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 );
+
gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow),
GTK_WIDGET(m_radio),
m_x+10, m_y+10+(i*24), 10, 10 );
wxSize ls = LayoutItems();
+ 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;
for (int i1 = 0; i1< num_of_rows; i1++)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
- GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
- GdkFont *font = m_widget->style->font;
- int len = 22+gdk_string_measure( font, label->label );
- if (len > max_len) max_len = len;
+
+ 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 += 22;
+ y += req.height;
node = node->Next();
if (!node) break;
}
res.x = x+4;
- res.y += 9;
+ res.y += 4;
}
else
{
wxNode *node = m_boxes.First();
while (node)
{
- GtkButton *button = GTK_BUTTON( node->Data() );
- GtkLabel *label = GTK_LABEL( button->child );
+ GtkWidget *button = GTK_WIDGET( node->Data() );
- GdkFont *font = m_widget->style->font;
- int len = 22+gdk_string_measure( font, label->label );
- if (len > max) max = len;
+ 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->Next();
}
return FALSE;
}
-#endif
+void wxRadioBox::OnInternalIdle()
+{
+ if ( m_lostFocus )
+ {
+ m_hasFocus = FALSE;
+ m_lostFocus = FALSE;
+
+ wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
+ event.SetEventObject( this );
+
+ (void)GetEventHandler()->ProcessEvent( event );
+ }
+}
+
+#endif // wxUSE_RADIOBOX
+
projects / wxWidgets.git / blobdiff