X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10bd1f7d3bae0955cc7244c8c35d5e1151517c94..37ed592f7106e4ba483baa6fba91a9c481048bbc:/src/gtk/hyperlink.cpp?ds=sidebyside diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp index 701aeb934d..d9d9ea1420 100644 --- 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" @@ -76,8 +76,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, // do validation checks: CheckParams(label, url, style); - m_needParent = true; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { @@ -153,7 +151,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();