docstring fixes

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 938ca0d69cc8ae5e85880e8ef9e9bb5ed167bbd6..f38936d468c46fdfb1bdc33f689f46bf577a709b 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-

 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif


@@ -30,10 +29,28 @@
 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+// wxGTKRadioButtonInfo
+//-----------------------------------------------------------------------------
+// structure internally used by wxRadioBox to store its child buttons
+
+class wxGTKRadioButtonInfo : public wxObject
+{
+public:
+    wxGTKRadioButtonInfo( GtkRadioButton * abutton, const wxRect & arect )
+    : button( abutton ), rect( arect ) {}
+
+    GtkRadioButton * button;
+    wxRect           rect;
+};
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST( wxRadioBoxButtonsInfoList );
+

 extern bool          g_blockEventsOnDrag;
 extern wxWindowGTK  *g_delayedFocus;
 
 extern bool          g_blockEventsOnDrag;
 extern wxWindowGTK  *g_delayedFocus;
 


@@ -94,7 +111,11 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
         return FALSE;
     }
 
         return FALSE;
     }
 

-    wxList::compatibility_iterator node = rb->m_buttons.Find( (wxObject*) widget );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = rb->m_buttonsInfo.GetFirst();
+    while( node && GTK_WIDGET( node->GetData()->button ) != widget )
+    {
+        node = node->GetNext();
+    }

     if (!node)
     {
         return FALSE;
     if (!node)
     {
         return FALSE;


@@ -105,20 +126,20 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
     {
     if ((gdk_event->keyval == GDK_Up) ||
         (gdk_event->keyval == GDK_Left))
     {

-        if (node == rb->m_buttons.GetFirst())
-            node = rb->m_buttons.GetLast();
+        if (node == rb->m_buttonsInfo.GetFirst())
+            node = rb->m_buttonsInfo.GetLast();

         else
             node = node->GetPrevious();
     }
     else
     {
         else
             node = node->GetPrevious();
     }
     else
     {

-        if (node == rb->m_buttons.GetLast())
-            node = rb->m_buttons.GetFirst();
+        if (node == rb->m_buttonsInfo.GetLast())
+            node = rb->m_buttonsInfo.GetFirst();

         else
             node = node->GetNext();
     }
 
         else
             node = node->GetNext();
     }
 

-    GtkWidget *button = (GtkWidget*) node->GetData();
+    GtkWidget *button = (GtkWidget*) node->GetData()->button;

 
     gtk_widget_grab_focus( button );
 
 
     gtk_widget_grab_focus( button );
 


@@ -171,6 +192,29 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget,
 }
 }
 
 }
 }
 

+extern "C" {
+static void gtk_radiobutton_size_allocate( GtkWidget *widget,
+                                           GtkAllocation * alloc,
+                                           wxRadioBox *win )
+{
+    unsigned int n = 0;
+    for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = win->m_buttonsInfo.GetFirst();
+          node;
+          node = node->GetNext(), n++ )
+    {
+        if( widget == GTK_WIDGET(node->GetData()->button) )
+        {
+            const wxPoint origin = win->GetPosition();
+            wxRect rect = wxRect( alloc->x - origin.x, alloc->y - origin.y,
+                                  alloc->width, alloc->height );
+            node->GetData()->rect = rect;
+            break;
+        }
+    }
+}
+}
+
+

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------


@@ -251,7 +295,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         g_signal_connect (rbtn, "key_press_event",
                           G_CALLBACK (gtk_radiobox_keypress_callback), this);
 
         g_signal_connect (rbtn, "key_press_event",
                           G_CALLBACK (gtk_radiobox_keypress_callback), this);
 

-        m_buttons.Append( (wxObject*) rbtn );
+        m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) );

 
         if (HasFlag(wxRA_SPECIFY_COLS))
         {
 
         if (HasFlag(wxRA_SPECIFY_COLS))
         {


@@ -283,6 +327,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                           G_CALLBACK (gtk_radiobutton_focus_in), this);
         g_signal_connect (rbtn, "focus_out_event",
                           G_CALLBACK (gtk_radiobutton_focus_out), this);
                           G_CALLBACK (gtk_radiobutton_focus_in), this);
         g_signal_connect (rbtn, "focus_out_event",
                           G_CALLBACK (gtk_radiobutton_focus_out), this);

+        g_signal_connect (rbtn, "size_allocate",
+                          G_CALLBACK (gtk_radiobutton_size_allocate), this);

     }
 
     m_parent->DoAddChild( this );
     }
 
     m_parent->DoAddChild( this );


@@ -294,13 +340,14 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );

         gtk_widget_destroy( button );
         node = node->GetNext();
     }
         gtk_widget_destroy( button );
         node = node->GetNext();
     }

+    WX_CLEAR_LIST( wxRadioBoxButtonsInfoList, m_buttonsInfo );

 }
 
 bool wxRadioBox::Show( bool show )
 }
 
 bool wxRadioBox::Show( bool show )


@@ -316,10 +363,10 @@ bool wxRadioBox::Show( bool show )
     if ( HasFlag(wxNO_BORDER) )
         gtk_widget_hide( m_widget );
 
     if ( HasFlag(wxNO_BORDER) )
         gtk_widget_hide( m_widget );
 

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );

 
         if (show)
             gtk_widget_show( button );
 
         if (show)
             gtk_widget_show( button );


@@ -336,12 +383,12 @@ void wxRadioBox::SetFocus()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    if (m_buttons.GetCount() == 0) return;
+    if (m_buttonsInfo.GetCount() == 0) return;

 
 

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );

         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );
         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );


@@ -355,11 +402,11 @@ void wxRadioBox::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( n );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n );

 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );

 
     GtkDisableEvents();
 
 
     GtkDisableEvents();
 


@@ -374,10 +421,10 @@ int wxRadioBox::GetSelection(void) const
 
     int count = 0;
 
 
     int count = 0;
 

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() );
+        GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );

         if (button->active) return count;
         count++;
         node = node->GetNext();
         if (button->active) return count;
         count++;
         node = node->GetNext();


@@ -392,11 +439,11 @@ wxString wxRadioBox::GetString(unsigned int n) const
 {
     wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( n );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n );

 
     wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 

-    GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child);
+    GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child);

 
     wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
 
 
     wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
 


@@ -414,11 +461,11 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );

 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 
 
     wxCHECK_RET( node, wxT("radiobox wrong index") );
 

-    GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child);
+    GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child);

 
     gtk_label_set_text( g_label, wxGTK_CONV( label ) );
 }
 
     gtk_label_set_text( g_label, wxGTK_CONV( label ) );
 }


@@ -428,10 +475,10 @@ bool wxRadioBox::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         return false;
 
     if ( !wxControl::Enable( enable ) )
         return false;
 

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkButton *button = GTK_BUTTON( node->GetData() );
+        GtkButton *button = GTK_BUTTON( node->GetData()->button );

         GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
 
         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
         GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
 
         gtk_widget_set_sensitive( GTK_WIDGET(button), enable );


@@ -446,11 +493,11 @@ bool wxRadioBox::Enable(unsigned int item, bool enable)
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );

 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 

-    GtkButton *button = GTK_BUTTON( node->GetData() );
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );

     GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child);
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );


@@ -463,11 +510,11 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );

 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 

-    GtkButton *button = GTK_BUTTON( node->GetData() );
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );

 
     // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if
     // the parent radiobox is disabled
 
     // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if
     // the parent radiobox is disabled


@@ -478,11 +525,11 @@ bool wxRadioBox::Show(unsigned int item, bool show)
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );

 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 

-    GtkWidget *button = GTK_WIDGET( node->GetData() );
+    GtkWidget *button = GTK_WIDGET( node->GetData()->button );

 
     if (show)
         gtk_widget_show( button );
 
     if (show)
         gtk_widget_show( button );


@@ -496,26 +543,26 @@ bool wxRadioBox::IsItemShown(unsigned int item) const
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 

-    wxList::compatibility_iterator node = m_buttons.Item( item );
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item );

 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
 
     wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 

-    GtkButton *button = GTK_BUTTON( node->GetData() );
+    GtkButton *button = GTK_BUTTON( node->GetData()->button );

 
     return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));
 }
 
 unsigned int wxRadioBox::GetCount() const
 {
 
     return GTK_WIDGET_VISIBLE(GTK_WIDGET(button));
 }
 
 unsigned int wxRadioBox::GetCount() const
 {

-    return m_buttons.GetCount();
+    return m_buttonsInfo.GetCount();

 }
 
 void wxRadioBox::GtkDisableEvents()
 {
 }
 
 void wxRadioBox::GtkDisableEvents()
 {

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        g_signal_handlers_disconnect_by_func (node->GetData(),
+        g_signal_handlers_disconnect_by_func (node->GetData()->button,

                                               (gpointer) gtk_radiobutton_clicked_callback,
                                               this);
 
                                               (gpointer) gtk_radiobutton_clicked_callback,
                                               this);
 


@@ -525,10 +572,10 @@ void wxRadioBox::GtkDisableEvents()
 
 void wxRadioBox::GtkEnableEvents()
 {
 
 void wxRadioBox::GtkEnableEvents()
 {

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        g_signal_connect (node->GetData(), "clicked",
+        g_signal_connect (node->GetData()->button, "clicked",

                           G_CALLBACK (gtk_radiobutton_clicked_callback), this);
 
         node = node->GetNext();
                           G_CALLBACK (gtk_radiobutton_clicked_callback), this);
 
         node = node->GetNext();


@@ -539,10 +586,10 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
 
 {
     GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
 

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *widget = GTK_WIDGET( node->GetData() );
+        GtkWidget *widget = GTK_WIDGET( node->GetData()->button );

 
         gtk_widget_modify_style( widget, style );
         gtk_widget_modify_style(GTK_BIN(widget)->child, style);
 
         gtk_widget_modify_style( widget, style );
         gtk_widget_modify_style(GTK_BIN(widget)->child, style);


@@ -566,13 +613,13 @@ void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip)
 {
     // set this tooltip for all radiobuttons which don't have their own tips
     unsigned n = 0;
 {
     // set this tooltip for all radiobuttons which don't have their own tips
     unsigned n = 0;

-    for ( wxList::compatibility_iterator node = m_buttons.GetFirst();
+    for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

           node;
           node = node->GetNext(), n++ )
     {
         if ( !GetItemToolTip(n) )
         {
           node;
           node = node->GetNext(), n++ )
     {
         if ( !GetItemToolTip(n) )
         {

-            wxToolTip::Apply(GTK_WIDGET(node->GetData()),
+            wxToolTip::Apply(GTK_WIDGET(node->GetData()->button),

                              wxConvCurrent->cWX2MB(tip));
         }
     }
                              wxConvCurrent->cWX2MB(tip));
         }
     }


@@ -586,7 +633,7 @@ void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip)
     if ( tooltip )
         buf = wxGTK_CONV(tooltip->GetTip());
 
     if ( tooltip )
         buf = wxGTK_CONV(tooltip->GetTip());
 

-    wxToolTip::Apply(GTK_WIDGET(m_buttons[n]), buf);
+    wxToolTip::Apply(GTK_WIDGET(m_buttonsInfo[n]->button), buf);

 }
 
 #endif // wxUSE_TOOLTIPS
 }
 
 #endif // wxUSE_TOOLTIPS


@@ -596,10 +643,10 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
     if (window == m_widget->window)
         return true;
 
     if (window == m_widget->window)
         return true;
 

-    wxList::compatibility_iterator node = m_buttons.GetFirst();
+    wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();

     while (node)
     {
     while (node)
     {

-        GtkWidget *button = GTK_WIDGET( node->GetData() );
+        GtkWidget *button = GTK_WIDGET( node->GetData()->button );

 
         if (window == button->window)
             return true;
 
         if (window == button->window)
             return true;


@@ -647,4 +694,18 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return attr;
 }
 
     return attr;
 }
 

+int wxRadioBox::GetItemFromPoint(const wxPoint& point) const
+{
+    const wxPoint pt = ScreenToClient(point);
+    unsigned n = 0;
+    for ( wxRadioBoxButtonsInfoList::compatibility_iterator
+            node = m_buttonsInfo.GetFirst(); node; node = node->GetNext(), n++ )
+    {
+        if ( m_buttonsInfo[n]->rect.Inside(pt) )
+            return n;
+    }
+
+    return wxNOT_FOUND;
+}
+

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX