attempts to process non ASCII key strokes properly

[wxWidgets.git] / src / gtk / radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index a65b07843534e7db35a3a5609740b13488d75c87..64881d7cfc6ab1252c43d387104097a91f27290b 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -11,12 +11,15 @@
 #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>
@@ -114,14 +117,61 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
     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,
@@ -130,10 +180,6 @@ 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 ))
     {
@@ -143,7 +189,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     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;
 
@@ -175,6 +223,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         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 );
@@ -192,6 +246,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     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;
@@ -269,7 +329,7 @@ wxSize wxRadioBox::LayoutItems()
                 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;
@@ -314,7 +374,7 @@ wxSize wxRadioBox::LayoutItems()
             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;
@@ -659,4 +719,19 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
     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
+