Updated documentation according to recent array changes.

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 20d1af4563e1f1c85b5aa662e26d433176c9ec59..98e57717ad7fbfb1a2f3e63f2576e5b772995f60 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/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"


@@ -79,35 +79,35 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
     {
         return FALSE;
     }
     {
         return FALSE;
     }

-    
+

     wxNode *node = rb->m_boxes.Find( (wxObject*) widget );
     if (!node)
     {
         return FALSE;
     }
     wxNode *node = rb->m_boxes.Find( (wxObject*) widget );
     if (!node)
     {
         return FALSE;
     }

-    
+

     gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
     gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );

-    
+

     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
     {
         if (node == rb->m_boxes.First())
     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
     {
         if (node == rb->m_boxes.First())

-           node = rb->m_boxes.Last();
-       else
-           node = node->Previous();
+            node = rb->m_boxes.Last();
+        else
+            node = node->Previous();

     }
     else
     {
         if (node == rb->m_boxes.Last())
     }
     else
     {
         if (node == rb->m_boxes.Last())

-           node = rb->m_boxes.First();
-       else
-           node = node->Next();
+            node = rb->m_boxes.First();
+        else
+            node = node->Next();

     }
     }

-    
+

     GtkWidget *button = (GtkWidget*) node->Data();
     GtkWidget *button = (GtkWidget*) node->Data();

-       
+

     gtk_widget_grab_focus( button );
     gtk_widget_grab_focus( button );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -206,7 +206,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
            GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
            GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );

-          
+

         m_boxes.Append( (wxObject*) m_radio );
 
         ConnectWidget( GTK_WIDGET(m_radio) );
         m_boxes.Append( (wxObject*) m_radio );
 
         ConnectWidget( GTK_WIDGET(m_radio) );


@@ -230,7 +230,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     m_parent->DoAddChild( this );
 
     PostCreation();
     m_parent->DoAddChild( this );
 
     PostCreation();

-    
+

     ApplyWidgetStyle();
 
     SetLabel( title );
     ApplyWidgetStyle();
 
     SetLabel( title );


@@ -244,7 +244,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     req.height = 2;
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
     if (req.width > ls.x) ls.x = req.width;
     req.height = 2;
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
     if (req.width > ls.x) ls.x = req.width;

-    
+

     wxSize newSize = size;
     if (newSize.x == -1) newSize.x = ls.x;
     if (newSize.y == -1) newSize.y = ls.y;
     wxSize newSize = size;
     if (newSize.x == -1) newSize.x = ls.x;
     if (newSize.y == -1) newSize.y = ls.y;


@@ -272,7 +272,7 @@ wxRadioBox::~wxRadioBox()
 void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );

-    
+

     LayoutItems();
 }
 
     LayoutItems();
 }
 


@@ -305,7 +305,7 @@ wxSize wxRadioBox::LayoutItems()
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }

-       
+

     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {


@@ -318,13 +318,13 @@ wxSize wxRadioBox::LayoutItems()
             for (int i1 = 0; i1< num_of_rows; i1++)
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
             for (int i1 = 0; i1< num_of_rows; i1++)
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );

-               
+

                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;
                 (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
                       (button, &req );
                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;
                 (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
                       (button, &req );

-               
+

                 if (req.width > max_len) max_len = req.width;
 
                 gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 if (req.width > max_len) max_len = req.width;
 
                 gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );


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


@@ -470,9 +469,9 @@ void wxRadioBox::SetSelection( int n )
     GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
 
     GtkDisableEvents();
     GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
 
     GtkDisableEvents();

-    
+

     gtk_toggle_button_set_active( button, 1 );
     gtk_toggle_button_set_active( button, 1 );

-    
+

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


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


@@ -526,7 +517,7 @@ void wxRadioBox::SetLabel( const wxString& label )
     gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
 }
 
     gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
 }
 

-void wxRadioBox::SetLabel( int item, const wxString& label )
+void wxRadioBox::SetString( int item, const wxString& label )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 


@@ -534,17 +525,11 @@ void wxRadioBox::SetLabel( 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() );
 }
 

-void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
-{
-    wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
-}
-

 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )


@@ -554,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();
     }
 


@@ -572,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 )


@@ -603,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();


@@ -624,7 +612,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxRadioBox::Number() const
+int wxRadioBox::GetCount() const

 {
     return m_boxes.Number();
 }
 {
     return m_boxes.Number();
 }


@@ -647,7 +635,7 @@ void wxRadioBox::GtkDisableEvents()
         gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
         gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

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

     }
 }
 
     }
 }
 


@@ -659,7 +647,7 @@ void wxRadioBox::GtkEnableEvents()
         gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
         gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

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

     }
 }
 
     }
 }
 


@@ -675,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();
     }


@@ -724,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