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

backported minor corrections for compilation with gcc 3.3 (use cast of address instead of address of cast)

Browse Source 
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:
Gilles Depeyrot
2003-07-07 20:11:26 +00:00
parent 0653df2501
commit 296252dcf5
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/dc.cpp
View File

@@ -1739,7 +1739,7 @@ void wxDC::MacInstallFont() const
Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ; Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ;
Style qdStyle = font->m_macFontStyle ; Style qdStyle = font->m_macFontStyle ;
ATSUFontID atsuFont = font->m_macATSUFontID ; ATSUFontID atsuFont = font->m_macATSUFontID ;
status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ; status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ;
wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ; wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ;
ATSUAttributeTag atsuTags[] = ATSUAttributeTag atsuTags[] =
{ {

2
src/mac/carbon/toplevel.cpp
View File

@@ -271,7 +271,7 @@ void wxTopLevelWindowMac::MacInstallEventHandler()
::RemoveEventHandler((EventHandlerRef) m_macEventHandler); ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ; 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 #endif
} }

2
src/mac/dc.cpp
View File

@@ -1739,7 +1739,7 @@ void wxDC::MacInstallFont() const
Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ; Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ;
Style qdStyle = font->m_macFontStyle ; Style qdStyle = font->m_macFontStyle ;
ATSUFontID atsuFont = font->m_macATSUFontID ; ATSUFontID atsuFont = font->m_macATSUFontID ;
status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ; status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ;
wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ; wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ;
ATSUAttributeTag atsuTags[] = ATSUAttributeTag atsuTags[] =
{ {

2
src/mac/toplevel.cpp
View File

@@ -271,7 +271,7 @@ void wxTopLevelWindowMac::MacInstallEventHandler()
::RemoveEventHandler((EventHandlerRef) m_macEventHandler); ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ; 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 #endif
} }