From 296252dcf54b624b75b48945b995f08ccab86e1d Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Mon, 7 Jul 2003 20:11:26 +0000 Subject: [PATCH] backported minor corrections for compilation with gcc 3.3 (use cast of address instead of address of cast) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/dc.cpp | 2 +- src/mac/carbon/toplevel.cpp | 2 +- src/mac/dc.cpp | 2 +- src/mac/toplevel.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 15c51cf356..4dd96b14c2 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -1739,7 +1739,7 @@ void wxDC::MacInstallFont() const Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ; Style qdStyle = font->m_macFontStyle ; ATSUFontID atsuFont = font->m_macATSUFontID ; - status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ; + status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ; wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ; ATSUAttributeTag atsuTags[] = { diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 2b77c40ee6..9bfca44e71 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -271,7 +271,7 @@ void wxTopLevelWindowMac::MacInstallEventHandler() ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); m_macEventHandler = NULL ; } - InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); + InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler); #endif } diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp index 15c51cf356..4dd96b14c2 100644 --- a/src/mac/dc.cpp +++ b/src/mac/dc.cpp @@ -1739,7 +1739,7 @@ void wxDC::MacInstallFont() const Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ; Style qdStyle = font->m_macFontStyle ; ATSUFontID atsuFont = font->m_macATSUFontID ; - status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ; + status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ; wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ; ATSUAttributeTag atsuTags[] = { diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 2b77c40ee6..9bfca44e71 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -271,7 +271,7 @@ void wxTopLevelWindowMac::MacInstallEventHandler() ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); m_macEventHandler = NULL ; } - InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); + InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler); #endif }