From 441284d297c63f8db0de7eca70fa42561c58ddca Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 28 Mar 2000 18:30:13 +0000 Subject: [PATCH] compilation error for HP-UX fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datetime.h | 2 +- src/gtk/dcclient.cpp | 4 ++-- src/gtk1/dcclient.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 432ad74cba..aa77bcbfaf 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1262,7 +1262,7 @@ WX_DEFINE_EXPORTED_ARRAY(wxDateTimeHolidayAuthority *, wxHolidayAuthoritiesArray class wxDateTimeHolidaysModule; class WXDLLEXPORT wxDateTimeHolidayAuthority { - friend wxDateTimeHolidaysModule; +friend class wxDateTimeHolidaysModule; public: // returns TRUE if the given date is a holiday static bool IsHoliday(const wxDateTime& dt); diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index d96bfe8a6d..705d060cb4 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1284,8 +1284,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, for ( wxCoord srcY = 0; srcY < h; srcY++ ) { // transform source coords to dest coords - double r = sqrt(srcX*srcX + srcY*srcY); - double angleOrig = atan2(srcY, srcX) - rad; + double r = sqrt((double)srcX*srcX + srcY*srcY); + double angleOrig = atan2((double)srcY, (double)srcX) - rad; wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5), dstY = (wxCoord)(r*sin(angleOrig) + 0.5); diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index d96bfe8a6d..705d060cb4 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -1284,8 +1284,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, for ( wxCoord srcY = 0; srcY < h; srcY++ ) { // transform source coords to dest coords - double r = sqrt(srcX*srcX + srcY*srcY); - double angleOrig = atan2(srcY, srcX) - rad; + double r = sqrt((double)srcX*srcX + srcY*srcY); + double angleOrig = atan2((double)srcY, (double)srcX) - rad; wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5), dstY = (wxCoord)(r*sin(angleOrig) + 0.5);