added conditional compilation for IntToFixed/FixedToInt for Mac OS X 10.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1256,14 +1256,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
|
|||||||
m_macFontInstalled = false ;
|
m_macFontInstalled = false ;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef IntToFixed
|
||||||
inline Fixed IntToFixed( int inInt )
|
inline Fixed IntToFixed( int inInt )
|
||||||
{
|
{
|
||||||
return (((SInt32) inInt) << 16);
|
return (((SInt32) inInt) << 16);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#ifndef FixedToInt
|
||||||
inline int FixedToInt( Fixed inFixed )
|
inline int FixedToInt( Fixed inFixed )
|
||||||
{
|
{
|
||||||
return (((SInt32) inFixed) >> 16);
|
return (((SInt32) inFixed) >> 16);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
|
void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
|
||||||
double angle)
|
double angle)
|
||||||
|
@@ -1256,14 +1256,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
|
|||||||
m_macFontInstalled = false ;
|
m_macFontInstalled = false ;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef IntToFixed
|
||||||
inline Fixed IntToFixed( int inInt )
|
inline Fixed IntToFixed( int inInt )
|
||||||
{
|
{
|
||||||
return (((SInt32) inInt) << 16);
|
return (((SInt32) inInt) << 16);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#ifndef FixedToInt
|
||||||
inline int FixedToInt( Fixed inFixed )
|
inline int FixedToInt( Fixed inFixed )
|
||||||
{
|
{
|
||||||
return (((SInt32) inFixed) >> 16);
|
return (((SInt32) inFixed) >> 16);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
|
void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
|
||||||
double angle)
|
double angle)
|
||||||
|
Reference in New Issue
Block a user