bug fix for using multiline string (i.e. with embedded '\n's) in wxTextCtrl ctor

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 294820894fbbf55635d35b544a12f2ebd0c84d62..69897c451a902e4772fd4b4493359572fe3db0ef 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -4,7 +4,7 @@
 // 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

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


@@ -12,12 +12,14 @@
 #pragma implementation "radiobut.h"
 #endif
 
 #pragma implementation "radiobut.h"
 #endif
 

-#include "wx/radiobut.h"
+#include "wx/defs.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/radiobut.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

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


@@ -30,14 +32,15 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;

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

-void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 


@@ -45,6 +48,8 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButto
   
     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 );


@@ -63,17 +68,14 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;

-
-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, newSize, style, name );
-    

     m_isRadioButton = TRUE;
     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))
     {
 
     if (HasFlag(wxRB_GROUP))
     {


@@ -86,24 +88,24 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
         wxRadioButton *chief = (wxRadioButton*) NULL;
         wxWindowList::Node *node = parent->GetChildren().GetLast();
         while (node)
         wxRadioButton *chief = (wxRadioButton*) NULL;
         wxWindowList::Node *node = parent->GetChildren().GetLast();
         while (node)

-       {
-           wxWindow *child = node->GetData();
-           if (child->m_isRadioButton)
-           {
-                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();
+        {
+            wxWindow *child = node->GetData();
+            if (child->m_isRadioButton)
+            {
+                chief = (wxRadioButton*) child;
+                if (child->HasFlag(wxRB_GROUP)) break;
+            }
+            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;

         }
     }
 
         }
     }
 


@@ -111,10 +113,6 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
       
     SetLabel(label);
 
       
     SetLabel(label);
 

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

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


@@ -122,9 +120,19 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
   
     PostCreation();
 
   
     PostCreation();
 

+    SetFont( parent->GetFont() );
+
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+        

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

-    SetFont( parent->GetFont() );

   
     Show( TRUE );
 
   
     Show( TRUE );
 


@@ -133,7 +141,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
 
 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 );
   
     wxControl::SetLabel( label );
     GtkButton *bin = GTK_BUTTON( m_widget );


@@ -143,8 +151,8 @@ void wxRadioButton::SetLabel( const wxString& 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;
 


@@ -153,20 +161,22 @@ void wxRadioButton::SetValue( bool val )
 
     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 );
 }
 
 bool wxRadioButton::GetValue() const
 {
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
       GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 }
 
 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;
 }


@@ -188,4 +198,32 @@ void wxRadioButton::ApplyWidgetStyle()
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
 
     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();
+}
+
+wxSize wxRadioButton::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+

 #endif
 #endif