fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index a3446422f766ad7d494f518145bb798defbac956..779c22e58de928d1672e01911e58b95e466f2357 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -4,54 +4,43 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
-#endif
+#if wxUSE_RADIOBTN

 
 #include "wx/radiobut.h"
 
 #include "wx/radiobut.h"

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

 
 

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

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

-extern bool g_blockEventsOnDrag;
+extern bool           g_blockEventsOnDrag;

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

-static 
-void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+extern "C" {
+static
+void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (!rb->m_hasVMT) return;
     if (!rb->m_hasVMT) return;

-  
-    if (rb->m_blockFirstEvent)
-    {
-        rb->m_blockFirstEvent = FALSE;
-        return;
-    } 
-  
+

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

-  
+
+    if (!button->active) 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 );
+}

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


@@ -59,96 +48,136 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButto
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
 //-----------------------------------------------------------------------------
 
 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_acceptsFocus = TRUE;
-    m_needParent = TRUE;
-
-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, newSize, style, name );
-  
-    SetValidator( validator );
-
-    m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label.mbc_str() );
-      
-    m_theOtherRadioButtton = 
-       gtk_radio_button_new_with_label(
-         gtk_radio_button_group( GTK_RADIO_BUTTON(m_widget) ),
-         "button2" );
-  
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxRadioButton creation failed") );
+        return false;
+    }
+
+    GSList* radioButtonGroup = NULL;
+    if (!HasFlag(wxRB_GROUP) && !HasFlag(wxRB_SINGLE))
+    {
+        // search backward for last group start
+        wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
+        for (; node; node = node->GetPrevious())
+        {
+            wxWindow *child = node->GetData();
+            if (child->HasFlag(wxRB_GROUP) && wxIsKindOf(child, wxRadioButton))
+            {
+                radioButtonGroup = gtk_radio_button_get_group(
+                    GTK_RADIO_BUTTON(child->m_widget));
+                break;
+            }
+        }
+    }
+
+    m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
+    g_object_ref(m_widget);
+

     SetLabel(label);
 
     SetLabel(label);
 

-    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 );
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_radiobutton_clicked_callback), this);

 
 

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

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

-  
-    PostCreation();

 
 

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

 
 

-    return TRUE;
+    return true;

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

-    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().mbc_str() );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+
+    GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label);

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

-    wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
-  
-    if ( val == GetValue() )
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+
+    if (val == GetValue())

         return;
 
         return;
 

-    m_blockFirstEvent = TRUE;
-  
+    g_signal_handlers_block_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);
+

     if (val)
     if (val)

-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+    {
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+    }

     else
     else

-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_theOtherRadioButtton), TRUE );
+    {
+        // should give an assert
+        // RL - No it shouldn't.  A wxGenericValidator might try to set it
+        //      as FALSE.  Failing silently is probably TRTTD here.
+    }
+
+    g_signal_handlers_unblock_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobutton") );
-  
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") );
+

     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
 bool wxRadioButton::Enable( bool enable )
 {
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
 bool wxRadioButton::Enable( bool enable )
 {

+    bool isEnabled = IsEnabled();
+

     if ( !wxControl::Enable( enable ) )
     if ( !wxControl::Enable( enable ) )

-        return FALSE;
-  
-    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+        return false;
+
+    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+
+    if (!isEnabled && enable)
+    {
+        GTKFixSensitivity();
+    }

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxRadioButton::ApplyWidgetStyle()
+void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);

 }
 }

+
+GdkWindow *
+wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return GTK_BUTTON(m_widget)->event_window;
+}
+
+// static
+wxVisualAttributes
+wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
+    attr = GetDefaultAttributesFromGTKWidget(widget);
+    gtk_widget_destroy(wnd);
+    return attr;
+}
+
+
+#endif