Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fixes for universal

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-11-04 19:39:12 +00:00
parent 00bb6d6f57
commit 08809d1886
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/hyperlink.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_HYPERLINK_H__ #ifndef _WX_HYPERLINK_H_
#define _WX_HYPERLINK_H__ #define _WX_HYPERLINK_H_
#include "wx/defs.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" #include "wx/gtk/hyperlink.h"
#else #else
#include "wx/generic/hyperlink.h" #include "wx/generic/hyperlink.h"
@@ -153,4 +153,4 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
#endif // wxUSE_HYPERLINKCTRL #endif // wxUSE_HYPERLINKCTRL
#endif // _WX_HYPERLINK_H__ #endif // _WX_HYPERLINK_H_

2
src/gtk/hyperlink.cpp
View File

@@ -23,7 +23,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__) #if wxUSE_HYPERLINKCTRL && defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)
#include "wx/hyperlink.h" #include "wx/hyperlink.h"

2
src/gtk/window.cpp
View File

@@ -3979,7 +3979,7 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle)
void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style) void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
{ {
wxSuspendStyleEvents s(this); wxSuspendStyleEvents s(static_cast<wxWindow*>(this));
if (m_wxwindow) if (m_wxwindow)
gtk_widget_modify_style(m_wxwindow, style); gtk_widget_modify_style(m_wxwindow, style);