supporting promised file urls for transfer, see #14281

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

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index dc90de7e584d666e7cd9b9d1ce6ac24bd83ca492..c4e796ad4709c3db20b4bd1ec7f1c3df16747919 100644 (file)
--- a/src/gtk/hyperlink.cpp
+++ b/src/gtk/hyperlink.cpp
@@ -47,9 +47,6 @@ static inline bool UseNative()
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxGenericHyperlinkCtrl)
-
-
 // ----------------------------------------------------------------------------
 // "clicked"
 // ----------------------------------------------------------------------------
@@ -85,7 +82,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
 
         m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");
         g_object_ref(m_widget);
-        gtk_widget_show(m_widget);
 
         // alignment
         float x_alignment = 0.5;
@@ -126,6 +122,13 @@ wxSize wxHyperlinkCtrl::DoGetBestSize() const
     return wxGenericHyperlinkCtrl::DoGetBestSize();
 }
 
+wxSize wxHyperlinkCtrl::DoGetBestClientSize() const
+{
+    if ( UseNative() )
+        return wxControl::DoGetBestClientSize();
+    return wxGenericHyperlinkCtrl::DoGetBestClientSize();
+}
+
 void wxHyperlinkCtrl::SetLabel(const wxString &label)
 {
     if ( UseNative() )
@@ -151,7 +154,7 @@ wxString wxHyperlinkCtrl::GetURL() const
     if ( UseNative() )
     {
         const gchar *str = gtk_link_button_get_uri(GTK_LINK_BUTTON(m_widget));
-        return wxString(str, *wxConvFileName);
+        return wxString::FromUTF8(str);
     }
 
     return wxGenericHyperlinkCtrl::GetURL();