1. handle Alt-F4 in wxUniv, not wxMGL

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 69897c451a902e4772fd4b4493359572fe3db0ef..7d2557692f253918ec960e18e6c11028d53d865e 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -18,8 +18,7 @@
 
 #include "wx/radiobut.h"
 
 
 #include "wx/radiobut.h"
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -49,6 +48,8 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
     if (g_blockEventsOnDrag) return;
   
     if (!button->active) return;
     if (g_blockEventsOnDrag) return;
   
     if (!button->active) return;

+    
+    if (rb->m_blockEvent) return;

   
     wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
     event.SetInt( rb->GetValue() );
   
     wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
     event.SetInt( rb->GetValue() );


@@ -69,22 +70,24 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
     m_isRadioButton = TRUE;
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
     m_isRadioButton = TRUE;

+    
+    m_blockEvent = FALSE;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioButton creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioButton creation failed") );

-    return FALSE;
+        return FALSE;

     }
 
     if (HasFlag(wxRB_GROUP))
     {
     }
 
     if (HasFlag(wxRB_GROUP))
     {

-        /* start a new group */
+        // start a new group

         m_radioButtonGroup = (GSList*) NULL;
     }
     else
     {
         m_radioButtonGroup = (GSList*) NULL;
     }
     else
     {

-        /* search backward for last group start */
+        // search backward for last group start

         wxRadioButton *chief = (wxRadioButton*) NULL;
         wxWindowList::Node *node = parent->GetChildren().GetLast();
         while (node)
         wxRadioButton *chief = (wxRadioButton*) NULL;
         wxWindowList::Node *node = parent->GetChildren().GetLast();
         while (node)


@@ -99,12 +102,12 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
         }
         if (chief)
         {
         }
         if (chief)
         {

-            /* we are part of the group started by chief */
+            // we are part of the group started by chief

             m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
         }
         else
         {
             m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
         }
         else
         {

-            /* start a new group */
+            // start a new group

             m_radioButtonGroup = (GSList*) NULL;
         }
     }
             m_radioButtonGroup = (GSList*) NULL;
         }
     }


@@ -144,8 +147,7 @@ void wxRadioButton::SetLabel( const wxString& label )
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
   
     wxControl::SetLabel( label );
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
   
     wxControl::SetLabel( label );

-    GtkButton *bin = GTK_BUTTON( m_widget );
-    GtkLabel *g_label = GTK_LABEL( bin->child );
+    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );

     gtk_label_set( g_label, GetLabel().mbc_str() );
 }
 
     gtk_label_set( g_label, GetLabel().mbc_str() );
 }
 


@@ -156,8 +158,7 @@ void wxRadioButton::SetValue( bool val )
     if (val == GetValue())
         return;
 
     if (val == GetValue())
         return;
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+    m_blockEvent = TRUE;

 
     if (val)
     {
 
     if (val)
     {


@@ -170,8 +171,7 @@ void wxRadioButton::SetValue( bool val )
         //      as FALSE.  Failing silently is probably TRTTD here.
     }
 
         //      as FALSE.  Failing silently is probably TRTTD here.
     }
 

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

 }
 
 bool wxRadioButton::GetValue() const
 }
 
 bool wxRadioButton::GetValue() const


@@ -186,7 +186,7 @@ bool wxRadioButton::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         return FALSE;
   
     if ( !wxControl::Enable( enable ) )
         return FALSE;
   

-    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -195,12 +195,12 @@ void wxRadioButton::ApplyWidgetStyle()
 {
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 {
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );

-    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );

 }
 
 bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
 {
 }
 
 bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
 {

-    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);

 }
 
 void wxRadioButton::OnInternalIdle()
 }
 
 void wxRadioButton::OnInternalIdle()


@@ -208,14 +208,15 @@ void wxRadioButton::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok())
+    GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
+    if ( win && cursor.Ok())

     {
         /* I now set the cursor the anew in every OnInternalIdle call
        as setting the cursor in a parent window also effects the
        windows above so that checking for the current cursor is
        not possible. */
        
     {
         /* I now set the cursor the anew in every OnInternalIdle call
        as setting the cursor in a parent window also effects the
        windows above so that checking for the current cursor is
        not possible. */
        

-       gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() );
+       gdk_window_set_cursor( win, cursor.GetCursor() );

     }
 
     UpdateWindowUI();
     }
 
     UpdateWindowUI();