Add wxDataViewCtrl::ExpandAncestors() and call it from both EnsureVisible() and Select()

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

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index b06d5963aca847613315e71d5893cc9c66501226..44645ce0fab075e2486aef667c436e289b849207 100644 (file)
--- a/src/gtk/hyperlink.cpp
+++ b/src/gtk/hyperlink.cpp
@@ -23,7 +23,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__)
+#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)
 
 #include "wx/hyperlink.h"
 
@@ -37,7 +37,7 @@
 // local functions
 // ----------------------------------------------------------------------------
 
-inline bool UseNative()
+static inline bool UseNative()
 {
     // native gtk_link_button widget is only available in GTK+ 2.10 and later
     return !gtk_check_version(2, 10, 0);
@@ -76,9 +76,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
         // do validation checks:
         CheckParams(label, url, style);
 
-        m_needParent = true;
-        m_acceptsFocus = true;
-
         if (!PreCreation( parent, pos, size ) ||
             !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
         {
@@ -87,7 +84,8 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
         }
 
         m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");
-        gtk_widget_show( GTK_WIDGET(m_widget) );
+        g_object_ref(m_widget);
+        gtk_widget_show(m_widget);
 
         // alignment
         float x_alignment = 0.5;
@@ -144,7 +142,7 @@ void wxHyperlinkCtrl::SetLabel(const wxString &label)
 void wxHyperlinkCtrl::SetURL(const wxString &uri)
 {
     if ( UseNative() )
-        gtk_link_button_set_uri(GTK_LINK_BUTTON(m_widget), uri.c_str());
+        gtk_link_button_set_uri(GTK_LINK_BUTTON(m_widget), wxGTK_CONV(uri));
     else
         wxGenericHyperlinkCtrl::SetURL(uri);
 }
@@ -154,7 +152,7 @@ wxString wxHyperlinkCtrl::GetURL() const
     if ( UseNative() )
     {
         const gchar *str = gtk_link_button_get_uri(GTK_LINK_BUTTON(m_widget));
-        return wxConvFileName->cMB2WX(str);
+        return wxString(str, *wxConvFileName);
     }
 
     return wxGenericHyperlinkCtrl::GetURL();
@@ -172,21 +170,21 @@ void wxHyperlinkCtrl::SetNormalColour(const wxColour &colour)
 
 wxColour wxHyperlinkCtrl::GetNormalColour() const
 {
+    wxColour ret;
     if ( UseNative() )
     {
         GdkColor *link_color = NULL;
-        wxColour ret = wxNullColour;
 
         // convert GdkColor in wxColour
         gtk_widget_style_get(m_widget, "link-color", &link_color, NULL);
         if (link_color)
-            ret.Set(link_color->red, link_color->green, link_color->blue);
+            ret = wxColour(*link_color);
         gdk_color_free (link_color);
-
-        return ret;
     }
     else
-        return wxGenericHyperlinkCtrl::GetNormalColour();
+        ret = wxGenericHyperlinkCtrl::GetNormalColour();
+
+    return ret;
 }
 
 void wxHyperlinkCtrl::SetVisitedColour(const wxColour &colour)
@@ -201,21 +199,21 @@ void wxHyperlinkCtrl::SetVisitedColour(const wxColour &colour)
 
 wxColour wxHyperlinkCtrl::GetVisitedColour() const
 {
+    wxColour ret;
     if ( UseNative() )
     {
         GdkColor *link_color = NULL;
-        wxColour ret = wxNullColour;
 
         // convert GdkColor in wxColour
         gtk_widget_style_get(m_widget, "visited-link-color", &link_color, NULL);
         if (link_color)
-            ret.Set(link_color->red, link_color->green, link_color->blue);
+            ret = wxColour(*link_color);
         gdk_color_free (link_color);
-
-        return ret;
     }
     else
         return wxGenericHyperlinkCtrl::GetVisitedColour();
+
+    return ret;
 }
 
 void wxHyperlinkCtrl::SetHoverColour(const wxColour &colour)