build fixes for universal

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 6f9db016ca133af25b98415efb08b5e3ace5319e..9e0f90ddc16577a15d6cad9fb7317fee1e719592 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_HYPERLINK_H__
-#define _WX_HYPERLINK_H__
+#ifndef _WX_HYPERLINK_H_
+#define _WX_HYPERLINK_H_
 
 #include "wx/defs.h"
 
@@ -143,7 +143,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 
 
-#if defined(__WXGTK210__)
+#if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/hyperlink.h"
 #else
     #include "wx/generic/hyperlink.h"
@@ -153,4 +153,4 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 #endif // wxUSE_HYPERLINKCTRL
 
-#endif // _WX_HYPERLINK_H__
+#endif // _WX_HYPERLINK_H_

diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index 4ea40b70c72680f66b4e2d8970b709bc368b417d..d9d9ea1420f82963ca2e76d9ca2a6f117136b540 100644 (file)
--- 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"
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index fdfa1b8f63f3b61bdf3d5d054bc59d7103ead243..bd5ceeb856f0b7a7a79ceb5edd6d0c8080f97b3c 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3979,7 +3979,7 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle)
 
 void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    wxSuspendStyleEvents s(this);
+    wxSuspendStyleEvents s(static_cast<wxWindow*>(this));
 
     if (m_wxwindow)
         gtk_widget_modify_style(m_wxwindow, style);