Fixed a minor bug in hotKey handling.

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index d1edb9d78b1761001148a988949e5b26f6aa9a81..8ccd9ef3c03431ccdf4c5638d69fb579333dcb82 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -13,6 +13,15 @@
 #endif
 
 #include "wx/radiobut.h"
 #endif
 
 #include "wx/radiobut.h"

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

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


@@ -21,108 +30,125 @@
 extern bool g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxRadioButton
+// "clicked"

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

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-  
-static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+static 
+void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )

 {
 {

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

   
   

-  wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
-  event.SetInt( rb->GetValue() );
-  event.SetEventObject( rb );
-  rb->GetEventHandler()->ProcessEvent( event );
+    if (rb->m_blockFirstEvent)
+    {
+        rb->m_blockFirstEvent = FALSE;
+        return;
+    } 
+  
+    if (g_blockEventsOnDrag) return;
+  
+    wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
+    event.SetInt( rb->GetValue() );
+    event.SetEventObject( rb );
+    rb->GetEventHandler()->ProcessEvent( event );

 }
 
 }
 

+//-----------------------------------------------------------------------------
+// wxRadioButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
+  

 bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label,
   const wxPoint& pos,  const wxSize& size, long style,
   const wxValidator& validator, const wxString& name )
 {
 bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label,
   const wxPoint& pos,  const wxSize& size, long style,
   const wxValidator& validator, const wxString& name )
 {

-  m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+    m_needParent = TRUE;

 
 

-  wxSize newSize = size;
+    wxSize newSize = size;

 
 

-  PreCreation( parent, id, pos, newSize, style, name );
+    PreCreation( parent, id, pos, newSize, style, name );

   
   

-  SetValidator( validator );
+    SetValidator( validator );

 
 

-  m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label );
+    m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label.mbc_str() );

       
       

-  SetLabel(label);
+    m_theOtherRadioButtton = 
+       gtk_radio_button_new_with_label(
+         gtk_radio_button_group( GTK_RADIO_BUTTON(m_widget) ),
+         "button2" );
+  
+    SetLabel(label);

 
 

-  if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
+    m_blockFirstEvent = FALSE;
+    
+    if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label.mbc_str() );
+    if (newSize.y == -1) newSize.y = 26;
+    SetSize( newSize.x, newSize.y );

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );

        
        

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

 
 

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

 
 

-  return TRUE;
+    return TRUE;

 }
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
 }
 
 void wxRadioButton::SetLabel( const wxString& label )
 {

-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );

   
   

-  wxControl::SetLabel( label );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkLabel *g_label = GTK_LABEL( bin->child );
-  gtk_label_set( g_label, GetLabel() );
+    wxControl::SetLabel( label );
+    GtkButton *bin = GTK_BUTTON( m_widget );
+    GtkLabel *g_label = GTK_LABEL( bin->child );
+    gtk_label_set( g_label, GetLabel().mbc_str() );

 }
 
 void wxRadioButton::SetValue( bool val )
 {
 }
 
 void wxRadioButton::SetValue( bool val )
 {

-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );

   
   

-  gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
-}
+    if ( val == GetValue() )
+        return;

 
 

-bool wxRadioButton::GetValue(void) const
-{
-  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobutton" );
+    m_blockFirstEvent = TRUE;

   
   

-  return GTK_TOGGLE_BUTTON(m_widget)->active;
+    if (val)
+        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+    else
+        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_theOtherRadioButtton), TRUE );

 }
 
 }
 

-void wxRadioButton::Enable( bool enable )
+bool wxRadioButton::GetValue() const

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-  
-  wxControl::Enable( enable );
+    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobutton") );

   
   

-  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    return GTK_TOGGLE_BUTTON(m_widget)->active;

 }
 
 }
 

-void wxRadioButton::SetFont( const wxFont &font )
+bool wxRadioButton::Enable( bool enable )

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
+    if ( !wxControl::Enable( enable ) )
+        return FALSE;

   
   

-  wxControl::SetFont( font );
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
+    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+
+    return TRUE;

 }
 
 }
 

-void wxRadioButton::SetBackgroundColour( const wxColour &colour )
+void wxRadioButton::ApplyWidgetStyle()

 {
 {

-  return;
-
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-
-  wxControl::SetBackgroundColour( colour );
-  
-  if (!m_backgroundColour.Ok()) return;
-  
-  gtk_widget_set_style( GTK_BUTTON(m_widget)->child, 
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );

 }
 }

-