X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28e88942bc2c9db6ae9a8ef59545d446eefea5fb..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/gtk/hyperlink.cpp?ds=inline

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index 046c601aeb..a6fb6558d2 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"
 
@@ -40,16 +40,17 @@
 static inline bool UseNative()
 {
     // native gtk_link_button widget is only available in GTK+ 2.10 and later
+#ifdef __WXGTK3__
+    return true;
+#else
     return !gtk_check_version(2, 10, 0);
+#endif
 }
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxGenericHyperlinkCtrl)
-
-
 // ----------------------------------------------------------------------------
 // "clicked"
 // ----------------------------------------------------------------------------
@@ -76,8 +77,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 ))
         {
@@ -86,7 +85,7 @@ 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);
 
         // alignment
         float x_alignment = 0.5;
@@ -108,7 +107,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetInitialSize(size);
 
         // wxWindowGTK will connect to the enter_notify and leave_notify GTK+ signals
         // thus overriding GTK+'s internal signal handlers which set the cursor of
@@ -128,6 +126,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() )
@@ -153,7 +158,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::FromUTF8(str);
     }
 
     return wxGenericHyperlinkCtrl::GetURL();
@@ -240,7 +245,7 @@ wxColour wxHyperlinkCtrl::GetHoverColour() const
 
 GdkWindow *wxHyperlinkCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-    return UseNative() ? GTK_BUTTON(m_widget)->event_window
+    return UseNative() ? gtk_button_get_event_window(GTK_BUTTON(m_widget))
                        : wxGenericHyperlinkCtrl::GTKGetWindow(windows);
 }