GTK2: gtk_draw_* -> gtk_paint_*

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index f7771f4ea6bbdf19bd8703b8f34a83d5e9bc97b0..6c8e0b91e3528b7fc32932a67099818263dfcd05 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -4,20 +4,17 @@
 // 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_RADIOBOX

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

-#if wxUSE_RADIOBOX
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"

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


@@ -30,142 +27,134 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool g_blockEventsOnDrag;
+extern bool           g_blockEventsOnDrag;
+extern wxCursor       g_globalCursor;
+extern wxWindowGTK   *g_delayedFocus;

 
 //-----------------------------------------------------------------------------
 // "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 (g_isIdle) wxapp_install_idle_handler();
 
     if (!rb->m_hasVMT) return;

-  
+

     if (g_blockEventsOnDrag) 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() );
     event.SetEventObject( rb );
     rb->GetEventHandler()->ProcessEvent( event );
 }
     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)
 
 //-----------------------------------------------------------------------------
 // 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_acceptsFocus = TRUE;
     m_needParent = 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 ))
     {
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {

-        wxFAIL_MSG( _T("wxRadioButton creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxRadioButton creation failed") );
+        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 = (wxRadioButton*) NULL;

-        wxWindowList::Node *node = parent->GetChildren().GetLast();
+        wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();

         while (node)
         while (node)

-       {
-           wxWindow *child = node->GetData();
-           if (child->m_isRadioButton)
-           {
-                chief = (wxRadioButton*) child;
-                if (child->HasFlag(wxRB_GROUP)) break;
-           }
-           node = node->GetPrevious();
+        {
+            wxWindow *child = node->GetData();
+            if (child->IsRadioButton())
+            {
+                chief = (wxRadioButton*) child;
+                if (child->HasFlag(wxRB_GROUP))
+                    break;
+            }
+            node = node->GetPrevious();
+        }
+        if (chief)
+        {
+            // we are part of the group started by chief
+            radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );

         }
         }

-       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;
-       }

     }
 
     }
 

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

     SetLabel(label);
 
     SetLabel(label);
 

-    wxSize newSize = size;
-    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 (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;
 }
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
 
     return TRUE;
 }
 
 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") );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+

     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)
     {

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

     }
     else
     {
         // should give an assert
     }
     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.

     }
     }

-       
-    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
 {

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


@@ -173,17 +162,70 @@ 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(GTK_BIN(m_widget)->child, enable);

 
     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);

 }
 
 }
 

+bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
+{
+    return window == GTK_BUTTON(m_widget)->event_window;
+}
+
+void wxRadioButton::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
+    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. */
+
+       gdk_window_set_cursor( win, cursor.GetCursor() );
+    }
+
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            gtk_widget_grab_focus( m_widget );
+            g_delayedFocus = NULL;
+        }
+    }
+
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+wxSize wxRadioButton::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
+// 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
 #endif