X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e678981e9a19bbba85d4ee9eb9bae5cb2fab7483..84c5131950767b011faa9cbab9ef389923d17597:/src/gtk/hyperlink.cpp?ds=sidebyside diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp index 697d7e358b..4ea40b70c7 100644 --- a/src/gtk/hyperlink.cpp +++ b/src/gtk/hyperlink.cpp @@ -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,7 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, } m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa"); - gtk_widget_show( GTK_WIDGET(m_widget) ); + gtk_widget_show(m_widget); // alignment float x_alignment = 0.5; @@ -154,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();