removed 2nd frame from html test sample; test sample now shows DL,DT,DD support

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

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index 294820894fbbf55635d35b544a12f2ebd0c84d62..5f58c9331e11384351a3e3631e920ec9e2868780 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_RADIOBOX
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -30,7 +30,8 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;
 
 //-----------------------------------------------------------------------------
 // "clicked"
@@ -63,17 +64,14 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
-
-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, newSize, style, name );
-    
     m_isRadioButton = TRUE;
-  
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
 
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxRadioButton creation failed") );
+       return FALSE;
+    }
 
     if (HasFlag(wxRB_GROUP))
     {
@@ -93,24 +91,25 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
                 chief = (wxRadioButton*) child;
                 if (child->HasFlag(wxRB_GROUP)) break;
            }
-           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;
-           }
            node = node->GetPrevious();
         }
+       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() );
       
     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 );
@@ -133,7 +132,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
   
     wxControl::SetLabel( label );
     GtkButton *bin = GTK_BUTTON( m_widget );
@@ -143,7 +142,7 @@ void wxRadioButton::SetLabel( const wxString& label )
 
 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;
@@ -166,7 +165,7 @@ void wxRadioButton::SetValue( bool val )
 
 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;
 }
@@ -188,4 +187,27 @@ void wxRadioButton::ApplyWidgetStyle()
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
 
+bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
+{
+    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+}
+
+void wxRadioButton::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (GTK_TOGGLE_BUTTON(m_widget)->event_window && 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( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() );
+    }
+
+    UpdateWindowUI();
+}
+
 #endif