Moved the check for page scrolling with the wheel into wxMouseEvent so

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 0b6045cd3ca24df15c70bd33342aec6abf9b50cb..98e57717ad7fbfb1a2f3e63f2576e5b772995f60 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -21,8 +21,7 @@
 #include "wx/frame.h"
 #include "wx/log.h"
 
 #include "wx/frame.h"
 #include "wx/log.h"
 

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

 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk/win_gtk.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk/win_gtk.h"


@@ -38,7 +37,8 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

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

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


@@ -427,10 +427,10 @@ int wxRadioBox::FindString( const wxString &s ) const
     wxNode *node = m_boxes.First();
     while (node)
     {
     wxNode *node = m_boxes.First();
     while (node)
     {

-        GtkButton *button = GTK_BUTTON( node->Data() );
+        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+        if (s == label->label)
+            return count;

 
 

-        GtkLabel *label = GTK_LABEL( button->child );
-        if (s == label->label) return count;

         count++;
 
         node = node->Next();
         count++;
 
         node = node->Next();


@@ -456,7 +456,6 @@ void wxRadioBox::SetFocus()
         }
         node = node->Next();
     }
         }
         node = node->Next();
     }

-

 }
 
 void wxRadioBox::SetSelection( int n )
 }
 
 void wxRadioBox::SetSelection( int n )


@@ -504,19 +503,11 @@ wxString wxRadioBox::GetString( int n ) const
 
     wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
 

-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *label = GTK_LABEL( button->child );
+    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );

 
     return wxString( label->label );
 }
 
 
     return wxString( label->label );
 }
 

-wxString wxRadioBox::GetLabel( int item ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
-
-    return GetString( item );
-}
-

 void wxRadioBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 void wxRadioBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );


@@ -534,8 +525,7 @@ void wxRadioBox::SetString( int item, const wxString& label )
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkButton *button = GTK_BUTTON( node->Data() );
-    GtkLabel *g_label = GTK_LABEL( button->child );
+    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->Data()) );

 
     gtk_label_set( g_label, label.mbc_str() );
 }
 
     gtk_label_set( g_label, label.mbc_str() );
 }


@@ -549,9 +539,10 @@ bool wxRadioBox::Enable( bool enable )
     while (node)
     {
         GtkButton *button = GTK_BUTTON( node->Data() );
     while (node)
     {
         GtkButton *button = GTK_BUTTON( node->Data() );

-        GtkWidget *label = button->child;
+        GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+

         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );

-        gtk_widget_set_sensitive( label, enable );
+        gtk_widget_set_sensitive( GTK_WIDGET(label), enable );

         node = node->Next();
     }
 
         node = node->Next();
     }
 


@@ -567,9 +558,10 @@ void wxRadioBox::Enable( int item, bool enable )
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
     GtkButton *button = GTK_BUTTON( node->Data() );
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
     GtkButton *button = GTK_BUTTON( node->Data() );

-    GtkWidget *label = button->child;
+    GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
+

     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );

-    gtk_widget_set_sensitive( label, enable );
+    gtk_widget_set_sensitive( GTK_WIDGET(label), enable );

 }
 
 void wxRadioBox::Show( int item, bool show )
 }
 
 void wxRadioBox::Show( int item, bool show )


@@ -598,7 +590,8 @@ wxString wxRadioBox::GetStringSelection() const
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
         if (button->active)
         {
         GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
         if (button->active)
         {

-            GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
+            GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->Data()) );
+

             return label->label;
         }
         node = node->Next();
             return label->label;
         }
         node = node->Next();


@@ -670,8 +663,7 @@ void wxRadioBox::ApplyWidgetStyle()
         GtkWidget *widget = GTK_WIDGET( node->Data() );
         gtk_widget_set_style( widget, m_widgetStyle );
 
         GtkWidget *widget = GTK_WIDGET( node->Data() );
         gtk_widget_set_style( widget, m_widgetStyle );
 

-        GtkButton *button = GTK_BUTTON( node->Data() );
-        gtk_widget_set_style( button->child, m_widgetStyle );
+        gtk_widget_set_style( BUTTON_CHILD(node->Data()), m_widgetStyle );

 
         node = node->Next();
     }
 
         node = node->Next();
     }


@@ -719,6 +711,15 @@ void wxRadioBox::OnInternalIdle()
 
         (void)GetEventHandler()->ProcessEvent( event );
     }
 
         (void)GetEventHandler()->ProcessEvent( event );
     }

+
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            g_delayedFocus = NULL;
+            SetFocus();
+        }
+    }

 }
 
 #endif // wxUSE_RADIOBOX
 }
 
 #endif // wxUSE_RADIOBOX