wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index df0ad406d2146f811f5511c186ac57ee20925de2..73968dc43bbcc6cbd27433bab57d6dfc0806ce01 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobut.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,7 +14,7 @@
 
 #include "wx/radiobut.h"
 
 
 #include "wx/radiobut.h"
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

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


@@ -40,23 +35,25 @@ extern wxWindowGTK   *g_delayedFocus;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "clicked"
 //-----------------------------------------------------------------------------
 

-static 
+extern "C" {
+static

 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!rb->m_hasVMT) return;
 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!rb->m_hasVMT) return;

-  
+

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

-  
+

     if (!button->active) return;
     if (!button->active) return;

-    
+

     if (rb->m_blockEvent) return;
     if (rb->m_blockEvent) return;

-  
+

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

-    rb->GetEventHandler()->ProcessEvent( event );
+    rb->HandleWindowEvent( event );
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -64,7 +61,7 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)

-  
+

 bool wxRadioButton::Create( wxWindow *parent,
                             wxWindowID id,
                             const wxString& label,
 bool wxRadioButton::Create( wxWindow *parent,
                             wxWindowID id,
                             const wxString& label,


@@ -76,7 +73,7 @@ bool wxRadioButton::Create( wxWindow *parent,
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;

-    
+

     m_blockEvent = FALSE;
 
     if (!PreCreation( parent, pos, size ) ||
     m_blockEvent = FALSE;
 
     if (!PreCreation( parent, pos, size ) ||


@@ -86,15 +83,11 @@ bool wxRadioButton::Create( wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    if (HasFlag(wxRB_GROUP))
-    {
-        // start a new group
-        m_radioButtonGroup = (GSList*) NULL;
-    }
-    else
+    GSList* radioButtonGroup = NULL;
+    if (!HasFlag(wxRB_GROUP))

     {
         // search backward for last group start
     {
         // search backward for last group start

-        wxRadioButton *chief = (wxRadioButton*) NULL;
+        wxRadioButton *chief = NULL;

         wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
         while (node)
         {
         wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
         while (node)
         {


@@ -110,24 +103,19 @@ bool wxRadioButton::Create( wxWindow *parent,
         if (chief)
         {
             // we are part of the group started by chief
         if (chief)
         {
             // we are part of the group started by chief

-            m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
-        }
-        else
-        {
-            // start a new group
-            m_radioButtonGroup = (GSList*) NULL;
+            radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );

         }
     }
 
         }
     }
 

-    m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, wxGTK_CONV( label ) );
-      
+    m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
+

     SetLabel(label);
 
     SetLabel(label);
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );

-       
+

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

-  
+

     PostCreation(size);
 
     return TRUE;
     PostCreation(size);
 
     return TRUE;


@@ -136,15 +124,8 @@ bool wxRadioButton::Create( wxWindow *parent,
 void wxRadioButton::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
 void wxRadioButton::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );

-  
-    wxControl::SetLabel( label );
-    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );
-#ifdef __WXGTK20__
-    wxString label2 = PrepareLabelMnemonics( label );
-    gtk_label_set_text_with_mnemonic( g_label, wxGTK_CONV( label2 ) );
-#else
-    gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );
-#endif
+
+    GTKSetLabelForLabel(GTK_LABEL(BUTTON_CHILD(m_widget)), label);

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


@@ -173,7 +154,7 @@ void wxRadioButton::SetValue( bool val )
 bool wxRadioButton::GetValue() const
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") );
 bool wxRadioButton::GetValue() const
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") );

-  
+

     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 


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

-  
+

     gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
 
     return TRUE;
     gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
 
     return TRUE;


@@ -210,7 +191,7 @@ void wxRadioButton::OnInternalIdle()
        as setting the cursor in a parent window also effects the
        windows above so that checking for the current cursor is
        not possible. */
        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( win, cursor.GetCursor() );
     }
 
        gdk_window_set_cursor( win, cursor.GetCursor() );
     }