better fix for #11803, don't set iconized state for hidden window

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

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index 4ea40b70c72680f66b4e2d8970b709bc368b417d..54b8aa7d8ef1463875ff40cf4f6d6dfbc15179c5 100644 (file)
--- a/src/gtk/hyperlink.cpp
+++ b/src/gtk/hyperlink.cpp
@@ -23,7 +23,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__)
+#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)

 
 #include "wx/hyperlink.h"
 
 
 #include "wx/hyperlink.h"
 


@@ -84,6 +84,7 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
         }
 
         m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");
         }
 
         m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");

+        g_object_ref(m_widget);

         gtk_widget_show(m_widget);
 
         // alignment
         gtk_widget_show(m_widget);
 
         // alignment


@@ -106,7 +107,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
         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
 
         // wxWindowGTK will connect to the enter_notify and leave_notify GTK+ signals
         // thus overriding GTK+'s internal signal handlers which set the cursor of


@@ -151,7 +151,7 @@ wxString wxHyperlinkCtrl::GetURL() const
     if ( UseNative() )
     {
         const gchar *str = gtk_link_button_get_uri(GTK_LINK_BUTTON(m_widget));
     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();
     }
 
     return wxGenericHyperlinkCtrl::GetURL();