Remove wxT from prototype

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

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index 701aeb934da8815e003218ee9267737ab34cb217..a6fb6558d28146862dbb5189874c6f494cc312e9 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"
 


@@ -40,16 +40,17 @@
 static inline bool UseNative()
 {
     // native gtk_link_button widget is only available in GTK+ 2.10 and later
 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);
     return !gtk_check_version(2, 10, 0);

+#endif

 }
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 }
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxGenericHyperlinkCtrl)
-
-

 // ----------------------------------------------------------------------------
 // "clicked"
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // "clicked"
 // ----------------------------------------------------------------------------


@@ -76,8 +77,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
         // do validation checks:
         CheckParams(label, url, style);
 
         // do validation checks:
         CheckParams(label, url, style);
 

-        m_needParent = true;
-

         if (!PreCreation( parent, pos, size ) ||
             !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
         {
         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");
         }
 
         m_widget = gtk_link_button_new("asdfsaf asdfdsaf asdfdsa");

-        gtk_widget_show(m_widget);
+        g_object_ref(m_widget);

 
         // alignment
         float x_alignment = 0.5;
 
         // alignment
         float x_alignment = 0.5;


@@ -108,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


@@ -128,6 +126,13 @@ wxSize wxHyperlinkCtrl::DoGetBestSize() const
     return wxGenericHyperlinkCtrl::DoGetBestSize();
 }
 
     return wxGenericHyperlinkCtrl::DoGetBestSize();
 }
 

+wxSize wxHyperlinkCtrl::DoGetBestClientSize() const
+{
+    if ( UseNative() )
+        return wxControl::DoGetBestClientSize();
+    return wxGenericHyperlinkCtrl::DoGetBestClientSize();
+}
+

 void wxHyperlinkCtrl::SetLabel(const wxString &label)
 {
     if ( UseNative() )
 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));
     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();
     }
 
     return wxGenericHyperlinkCtrl::GetURL();


@@ -240,7 +245,7 @@ wxColour wxHyperlinkCtrl::GetHoverColour() const
 
 GdkWindow *wxHyperlinkCtrl::GTKGetWindow(wxArrayGdkWindows& windows) 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);
 }
 
                        : wxGenericHyperlinkCtrl::GTKGetWindow(windows);
 }