implemented SetItemToolTip()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index dd48a66911a9d78b18bd244ceeebc10f4a749fb1..ef0830aad9bf14a09767494fecebcd6079f6cf99 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -125,6 +125,10 @@ public:
     wxList           m_buttons;
 
 protected:
+#if wxUSE_TOOLTIPS
+    virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
+#endif
+
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
     virtual bool GTKWidgetNeedsMnemonic() const;

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 4a31911ff722319c95e13565606c79b607a2e095..3d1785b0d3741993da3d9b54874d29ebed21f91d 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -21,6 +21,10 @@
 #include "wx/dialog.h"
 #include "wx/frame.h"
 
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
+
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
@@ -558,16 +562,33 @@ void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
 }
 
 #if wxUSE_TOOLTIPS
-void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip)
 {
-    wxList::compatibility_iterator node = m_buttons.GetFirst();
-    while (node)
+    // set this tooltip for all radiobuttons which don't have their own tips
+    unsigned n = 0;
+    for ( wxList::compatibility_iterator node = m_buttons.GetFirst();
+          node;
+          node = node->GetNext(), n++ )
     {
-        GtkWidget *widget = GTK_WIDGET( node->GetData() );
-        gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
-        node = node->GetNext();
+        if ( !GetItemToolTip(n) )
+        {
+            wxToolTip::Apply(GTK_WIDGET(node->GetData()),
+                             wxConvCurrent->cWX2MB(tip));
+        }
     }
 }
+
+void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip)
+{
+    wxCharBuffer buf;
+    if ( !tooltip )
+        tooltip = GetToolTip();
+    if ( tooltip )
+        buf = wxGTK_CONV(tooltip->GetTip());
+
+    wxToolTip::Apply(GTK_WIDGET(m_buttons[n]), buf);
+}
+
 #endif // wxUSE_TOOLTIPS
 
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )