Add doc for wxGraphicsContext.Create(), which is a lightweight context with no target...

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

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index 21610311c50dea1c813a723aba8973d8e45dc757..a6fb6558d28146862dbb5189874c6f494cc312e9 100644 (file)
--- a/src/gtk/hyperlink.cpp
+++ b/src/gtk/hyperlink.cpp
@@ -40,7 +40,11 @@
 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

 }
 
 // ============================================================================
 }
 
 // ============================================================================


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

-        gtk_widget_show(m_widget);

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


@@ -242,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);
 }