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 a0e789bcbd65814a3fedd275062779d76e430941..779c22e58de928d1672e01911e58b95e466f2357 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -2,111 +2,182 @@
 // Name:        radiobut.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        radiobut.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// 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 "wx/gtk/private.h"
+

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

-extern bool g_blockEventsOnDrag;
+extern bool           g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "clicked"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static
+void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
+{
+    if (!rb->m_hasVMT) return;
+
+    if (g_blockEventsOnDrag) return;
+
+    if (!button->active) return;
+
+    wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
+    event.SetInt( rb->GetValue() );
+    event.SetEventObject( rb );
+    rb->HandleWindowEvent( event );
+}
+}

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

-  
-static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+
+bool wxRadioButton::Create( wxWindow *parent,
+                            wxWindowID id,
+                            const wxString& label,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name )
+{
+    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);
+
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;
+}
+
+void wxRadioButton::SetLabel( const wxString& label )

 {
 {

-  if (!rb->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
-  event.SetInt( rb->GetValue() );
-  event.SetEventObject( rb );
-  rb->GetEventHandler()->ProcessEvent( event );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+
+    GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label);

 }
 
 }
 

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

 {
 {

-  m_needParent = TRUE;
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+
+    if (val == GetValue())
+        return;
+
+    g_signal_handlers_block_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);
+
+    if (val)
+    {
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+    }
+    else
+    {
+        // 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);
+}

 
 

-  wxSize newSize = size;
+bool wxRadioButton::GetValue() const
+{
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") );

 
 

-  PreCreation( parent, id, pos, newSize, style, name );
-  
-  SetValidator( validator );
+    return GTK_TOGGLE_BUTTON(m_widget)->active;
+}

 
 

-  m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label );
-      
-  SetLabel(label);
+bool wxRadioButton::Enable( bool enable )
+{
+    bool isEnabled = IsEnabled();

 
 

-  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 );
+    if ( !wxControl::Enable( enable ) )
+        return false;

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-       
-  PostCreation();
+    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);

 
 

-  Show( TRUE );
+    if (!isEnabled && enable)
+    {
+        GTKFixSensitivity();
+    }

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-void wxRadioButton::SetLabel( const wxString& label )
+void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

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

 }
 
 }
 

-void wxRadioButton::SetValue( bool val )
+GdkWindow *
+wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-  gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
+    return GTK_BUTTON(m_widget)->event_window;

 }
 
 }
 

-bool wxRadioButton::GetValue(void) const
+// static
+wxVisualAttributes
+wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-  return GTK_TOGGLE_BUTTON(m_widget)->active;
+    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;

 }
 
 }
 

-void wxRadioButton::SetFont( const wxFont &font )
-{
-  m_font = font;
-  
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkWidget *label = bin->child;
-  
-  GtkStyle *style = (GtkStyle*) NULL;
-  if (!m_hasOwnStyle)
-  {
-    m_hasOwnStyle = TRUE;
-    style = gtk_style_copy( gtk_widget_get_style( label ) );
-  }
-  else
-  {
-    style = gtk_widget_get_style( label );
-  }
-  
-  gdk_font_unref( style->font );
-  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
-  
-  gtk_widget_set_style( label, style );
-}

 
 

+#endif