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
This commit is contained in:
@@ -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[] =
|
||||
{
|
||||
|
@@ -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
|
||||
}
|
||||
|
||||
|
@@ -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[] =
|
||||
{
|
||||
|
@@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user