removed corrected detection of wchar_t under Mac OS X (added in revision 1.355)

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index d0808503e706836b5c1e476ddda6253ce11e4656..64881d7cfc6ab1252c43d387104097a91f27290b 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -4,26 +4,41 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "radiobox.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "radiobox.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_RADIOBOX
+

 #include "wx/radiobox.h"
 #include "wx/radiobox.h"

+

 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"

+#include "wx/log.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"

 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 
 //-----------------------------------------------------------------------------
 // "clicked"


@@ -31,9 +46,11 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
 {
 
 static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
 {

-    if (!rb->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!rb->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnDrag) return;

-  
+

     if (rb->m_alreadySent)
     {
         rb->m_alreadySent = FALSE;
     if (rb->m_alreadySent)
     {
         rb->m_alreadySent = FALSE;


@@ -41,93 +58,214 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
     }
 
     rb->m_alreadySent = TRUE;
     }
 
     rb->m_alreadySent = TRUE;

-  
+

     wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
     event.SetInt( rb->GetSelection() );
     wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
     event.SetInt( rb->GetSelection() );

-    wxString tmp( rb->GetStringSelection() );
-    event.SetString( WXSTRINGCAST(tmp) );
+    event.SetString( rb->GetStringSelection() );

     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent(event);
 }
 
 //-----------------------------------------------------------------------------
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent(event);
 }
 
 //-----------------------------------------------------------------------------

-// wxRadioBox
+// "key_press_event"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
+static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
-    EVT_SIZE(wxRadioBox::OnSize)
-END_EVENT_TABLE()
+    if (!rb->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;

 
 

-wxRadioBox::wxRadioBox(void)
+    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;
+}
+
+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;

 }
 
 }
 

-bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
-                         const wxPoint &pos, const wxSize &size,
-                         int n, const wxString choices[], int majorDim, 
-                         long style, const wxValidator& validator, 
-                        const wxString &name )
+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)
+
+void wxRadioBox::Init()

 {
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 {
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

-  
-    PreCreation( parent, id, pos, size, style, name );

 
 

-    SetValidator( validator );
+    m_hasFocus =
+    m_lostFocus = FALSE;
+}
+
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
+                         const wxPoint &pos, const wxSize &size,
+                         int n, const wxString choices[], int majorDim,
+                         long style, const wxValidator& validator,
+                         const wxString &name )
+{
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxRadioBox creation failed") );
+       return FALSE;
+    }
+
+    m_widget = gtk_frame_new( title.mbc_str() );
+
+    // 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;

 
 

-    m_widget = gtk_frame_new( title );
-  
-    m_majorDim = majorDim;
-  

     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;

-  
+
+    wxString label;

     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
     {
     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
     {

-        if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
-      
-        m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
-      
+        if ( i != 0 )
+            radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+
+        label.Empty();
+        for ( const wxChar *pc = choices[i]; *pc; pc++ )
+        {
+            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 );
         m_boxes.Append( (wxObject*) m_radio );

-      
+

         ConnectWidget( GTK_WIDGET(m_radio) );
         ConnectWidget( GTK_WIDGET(m_radio) );

-  
+

         if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
         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_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), GTK_WIDGET(m_radio), m_x+10, m_y+10+(i*24) );
-      
+
+        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 );

     }
     }

+
+    m_parent->DoAddChild( this );
+
+    PostCreation();

     
     

+    ApplyWidgetStyle();
+
+    SetLabel( title );
+
+    SetFont( parent->GetFont() );
+

     wxSize ls = LayoutItems();
     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;
     SetSize( newSize.x, newSize.y );
     wxSize newSize = size;
     if (newSize.x == -1) newSize.x = ls.x;
     if (newSize.y == -1) newSize.y = ls.y;
     SetSize( newSize.x, newSize.y );

-  
-    m_parent->AddChild( this );

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
-  
-    PostCreation();
-  
-    SetLabel( title );
-  

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-wxRadioBox::~wxRadioBox(void)
+wxRadioBox::~wxRadioBox()

 {
     wxNode *node = m_boxes.First();
     while (node)
 {
     wxNode *node = m_boxes.First();
     while (node)


@@ -138,10 +276,10 @@ wxRadioBox::~wxRadioBox(void)
     }
 }
 
     }
 }
 

-void wxRadioBox::OnSize( wxSizeEvent &event )
+void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    wxControl::OnSize( event );
-  
+    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
+    

     LayoutItems();
 }
 
     LayoutItems();
 }
 


@@ -149,55 +287,80 @@ wxSize wxRadioBox::LayoutItems()
 {
     int x = 7;
     int y = 15;
 {
     int x = 7;
     int y = 15;

-    
+
+    if ( m_majorDim == 0 )
+    {
+        // avoid dividing by 0 below
+        wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
+
+        m_majorDim = 1;
+    }
+

     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;

-    
+

     wxSize res( 0, 0 );
     wxSize res( 0, 0 );

-  
-    if (m_windowStyle & wxRA_HORIZONTAL)
+
+    int num_of_cols = 0;
+    int num_of_rows = 0;
+    if (HasFlag(wxRA_SPECIFY_COLS))

     {
     {

+        num_of_cols = m_majorDim;
+        num_of_rows = num_per_major;
+    }
+    else
+    {
+        num_of_cols = num_per_major;
+        num_of_rows = m_majorDim;
+    }

        
        

-        for (int j = 0; j < m_majorDim; j++)
-       {
+    if ( HasFlag(wxRA_SPECIFY_COLS) ||
+         (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
+    {
+        for (int j = 0; j < num_of_cols; j++)
+        {

             y = 15;
             y = 15;

-           
+

             int max_len = 0;
             int max_len = 0;

-            wxNode *node = m_boxes.Nth( j*num_per_major );
-           for (int i = 0; i< num_per_major; i++)
-           {
+            wxNode *node = m_boxes.Nth( j*num_of_rows );
+            for (int i1 = 0; i1< num_of_rows; i1++)
+            {

                 GtkWidget *button = GTK_WIDGET( node->Data() );
                 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;

                
                

-                gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
-                y += 22;
+                GtkRequisition req;
+                req.width = 2;
+                req.height = 2;
+                (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
+                      (button, &req );

                
                

-               node = node->Next();
-               if (!node) break;
-           }
-           
-           // we don't know the max_len before
-           
-            node = m_boxes.Nth( j*num_per_major );
-           for (int i = 0; i< num_per_major; i++)
-           {
+                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 += req.height;
+
+                node = node->Next();
+                if (!node) break;
+            }
+
+            // we don't know the max_len before
+
+            node = m_boxes.Nth( j*num_of_rows );
+            for (int i2 = 0; i2< num_of_rows; i2++)
+            {

                 GtkWidget *button = GTK_WIDGET( node->Data() );
                 GtkWidget *button = GTK_WIDGET( node->Data() );

-               
-               gtk_widget_set_usize( button, max_len, 22 );
-               
-               node = node->Next();
-               if (!node) break;
-           }
-           
-           if (y > res.y) res.y = y;
-           
-           x += max_len + 2;
+
+                gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
+
+                node = node->Next();
+                if (!node) break;
+            }
+
+            if (y > res.y) res.y = y;
+
+            x += max_len + 2;

         }
         }

-       
-       res.x = x+4;
-       res.y += 9;
+
+        res.x = x+4;
+        res.y += 4;

     }
     else
     {
     }
     else
     {


@@ -206,47 +369,56 @@ wxSize wxRadioBox::LayoutItems()
         wxNode *node = m_boxes.First();
         while (node)
         {
         wxNode *node = m_boxes.First();
         while (node)
         {

-            GtkButton *button = GTK_BUTTON( node->Data() );
-            GtkLabel *label = GTK_LABEL( button->child );
-      
-            GdkFont *font = m_widget->style->font;
-            int len = 22+gdk_string_measure( font, label->label );
-            if (len > max) max = len;
-      
+            GtkWidget *button = GTK_WIDGET( node->Data() );
+
+            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();
         }
             node = node->Next();
         }

-    
+

         node = m_boxes.First();
         while (node)
         {
             GtkWidget *button = GTK_WIDGET( node->Data() );
         node = m_boxes.First();
         while (node)
         {
             GtkWidget *button = GTK_WIDGET( node->Data() );

-    
-            gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
+
+            gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );

             x += max;
             x += max;

-            gtk_widget_set_usize( button, max, 20 );
-      
+

             node = node->Next();
         }
             node = node->Next();
         }

-       res.x = x+4;
-       res.y = 42;
+        res.x = x+4;
+        res.y = 40;

     }
     }

-    
+

     return res;
 }
 
 bool wxRadioBox::Show( bool show )
 {
     return res;
 }
 
 bool wxRadioBox::Show( bool show )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
-  
-    wxWindow::Show( show );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+
+    if (!wxControl::Show(show))
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    if ((m_windowStyle & wxNO_BORDER) != 0)
+        gtk_widget_hide( m_widget );

 
     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->Data() );
 
     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->Data() );

-    
+

         if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
         if (show) gtk_widget_show( button ); else gtk_widget_hide( button );

-    
+

         node = node->Next();
     }
 
         node = node->Next();
     }
 


@@ -255,65 +427,68 @@ bool wxRadioBox::Show( bool show )
 
 int wxRadioBox::FindString( const wxString &s ) const
 {
 
 int wxRadioBox::FindString( const wxString &s ) const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
-  
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+

     int count = 0;
     int count = 0;

-  
+

     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkButton *button = GTK_BUTTON( node->Data() );
     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkButton *button = GTK_BUTTON( node->Data() );

-    
+

         GtkLabel *label = GTK_LABEL( button->child );
         if (s == label->label) return count;
         count++;
         GtkLabel *label = GTK_LABEL( button->child );
         if (s == label->label) return count;
         count++;

-    
+

         node = node->Next();
     }
         node = node->Next();
     }

-  
+

     return -1;
 }
 
 void wxRadioBox::SetFocus()
 {
     return -1;
 }
 
 void wxRadioBox::SetFocus()
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-    
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     if (m_boxes.GetCount() == 0) return;
     if (m_boxes.GetCount() == 0) return;

-    
+

     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
         if (button->active)
     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
         if (button->active)

-       {
+        {

             gtk_widget_grab_focus( GTK_WIDGET(button) );
             gtk_widget_grab_focus( GTK_WIDGET(button) );

-           
-           return;
-       }
+            return;
+        }

         node = node->Next();
     }
         node = node->Next();
     }

-    
+

 }
 
 void wxRadioBox::SetSelection( int n )
 {
 }
 
 void wxRadioBox::SetSelection( int n )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     wxNode *node = m_boxes.Nth( n );
     wxNode *node = m_boxes.Nth( n );

-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
+
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
+

     GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
     GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );

-  
+
+    GtkDisableEvents();
+    

     gtk_toggle_button_set_state( button, 1 );
     gtk_toggle_button_set_state( button, 1 );

+    
+    GtkEnableEvents();

 }
 
 int wxRadioBox::GetSelection(void) const
 {
 }
 
 int wxRadioBox::GetSelection(void) const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
-  
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+

     int count = 0;
     int count = 0;

-  
+

     wxNode *node = m_boxes.First();
     while (node)
     {
     wxNode *node = m_boxes.First();
     while (node)
     {


@@ -322,65 +497,66 @@ int wxRadioBox::GetSelection(void) const
         count++;
         node = node->Next();
     }
         count++;
         node = node->Next();
     }

-  
-    wxFAIL_MSG( "wxRadioBox none selected" );
-  
+
+    wxFAIL_MSG( wxT("wxRadioBox none selected") );
+

     return -1;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
     return -1;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
-  
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+

     wxNode *node = m_boxes.Nth( n );
     wxNode *node = m_boxes.Nth( n );

-  
-    wxCHECK_MSG( node, "", "radiobox wrong index" );
-  
+
+    wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
+

     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *label = GTK_LABEL( button->child );
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *label = GTK_LABEL( button->child );

-  
+

     return wxString( label->label );
 }
 
 wxString wxRadioBox::GetLabel( int item ) const
 {
     return wxString( label->label );
 }
 
 wxString wxRadioBox::GetLabel( int item ) const
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
-  
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+

     return GetString( item );
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {
     return GetString( item );
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     wxControl::SetLabel( label );
     wxControl::SetLabel( label );

-  
-    gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel() );
+
+    gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );

 }
 
 void wxRadioBox::SetLabel( int item, const wxString& label )
 {
 }
 
 void wxRadioBox::SetLabel( int item, const wxString& label )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     wxNode *node = m_boxes.Nth( item );
     wxNode *node = m_boxes.Nth( item );

-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
+
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
+

     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *g_label = GTK_LABEL( button->child );
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkLabel *g_label = GTK_LABEL( button->child );

-  
-    gtk_label_set( g_label, label );
+
+    gtk_label_set( g_label, label.mbc_str() );

 }
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
 {
 }
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
 {

-    wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+    wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));

 }
 
 }
 

-void wxRadioBox::Enable( bool enable )
+bool wxRadioBox::Enable( bool enable )

 {
 {

-    wxControl::Enable( enable );
-  
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;
+

     wxNode *node = m_boxes.First();
     while (node)
     {
     wxNode *node = m_boxes.First();
     while (node)
     {


@@ -390,16 +566,18 @@ void wxRadioBox::Enable( bool enable )
         gtk_widget_set_sensitive( label, enable );
         node = node->Next();
     }
         gtk_widget_set_sensitive( label, enable );
         node = node->Next();
     }

+
+    return TRUE;

 }
 
 void wxRadioBox::Enable( int item, bool enable )
 {
 }
 
 void wxRadioBox::Enable( int item, bool enable )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     wxNode *node = m_boxes.Nth( item );
     wxNode *node = m_boxes.Nth( item );

-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
+
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
+

     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkWidget *label = button->child;
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     GtkButton *button = GTK_BUTTON( node->Data() );
     GtkWidget *label = button->child;
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );


@@ -408,12 +586,12 @@ void wxRadioBox::Enable( int item, bool enable )
 
 void wxRadioBox::Show( int item, bool show )
 {
 
 void wxRadioBox::Show( int item, bool show )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+

     wxNode *node = m_boxes.Nth( item );
     wxNode *node = m_boxes.Nth( item );

-  
-    wxCHECK_RET( node, "radiobox wrong index" );
-  
+
+    wxCHECK_RET( node, wxT("radiobox wrong index") );
+

     GtkWidget *button = GTK_WIDGET( node->Data() );
 
     if (show)
     GtkWidget *button = GTK_WIDGET( node->Data() );
 
     if (show)


@@ -422,10 +600,10 @@ void wxRadioBox::Show( int item, bool show )
         gtk_widget_hide( button );
 }
 
         gtk_widget_hide( button );
 }
 

-wxString wxRadioBox::GetStringSelection(void) const
+wxString wxRadioBox::GetStringSelection() const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
-  
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+

     wxNode *node = m_boxes.First();
     while (node)
     {
     wxNode *node = m_boxes.First();
     while (node)
     {


@@ -437,69 +615,123 @@ wxString wxRadioBox::GetStringSelection(void) const
         }
         node = node->Next();
     }
         }
         node = node->Next();
     }

-  
-    wxFAIL_MSG( "wxRadioBox none selected" );
-    return "";
+
+    wxFAIL_MSG( wxT("wxRadioBox none selected") );
+    return wxT("");

 }
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
 {
 }
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" ); 
-  
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+

     int res = FindString( s );
     if (res == -1) return FALSE;
     SetSelection( res );
     int res = FindString( s );
     if (res == -1) return FALSE;
     SetSelection( res );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxRadioBox::Number(void) const
+int wxRadioBox::Number() const

 {
     return m_boxes.Number();
 }
 
 {
     return m_boxes.Number();
 }
 

-int wxRadioBox::GetNumberOfRowsOrCols(void) const
+int wxRadioBox::GetNumberOfRowsOrCols() const

 {
     return 1;
 }
 
 void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 {
 {
     return 1;
 }
 
 void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 {

-    wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
+    wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
+}
+
+void wxRadioBox::GtkDisableEvents()
+{
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+        gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
+           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+       node = node->Next();
+    }
+}
+
+void wxRadioBox::GtkEnableEvents()
+{
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+        gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
+           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+       node = node->Next();
+    }

 }
 
 void wxRadioBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();
 }
 
 void wxRadioBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();

-  
+

     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( m_widget, m_widgetStyle );

-  
+

     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->Data() );
         gtk_widget_set_style( widget, m_widgetStyle );
     wxNode *node = m_boxes.First();
     while (node)
     {
         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 );
         GtkButton *button = GTK_BUTTON( node->Data() );
         gtk_widget_set_style( button->child, m_widgetStyle );

-    
+

         node = node->Next();
     }
 }
 
         node = node->Next();
     }
 }
 

+#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;
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
     if (window == m_widget->window) return TRUE;

-  
+

     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->Data() );
     wxNode *node = m_boxes.First();
     while (node)
     {
         GtkWidget *button = GTK_WIDGET( node->Data() );

-    
+

         if (window == button->window) return TRUE;
         if (window == button->window) return TRUE;

-    
+

         node = node->Next();
     }
         node = node->Next();
     }

-  
+

     return FALSE;
 }
     return FALSE;
 }

+
+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
+