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

compilation error for HP-UX fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-28 18:30:13 +00:00
parent 50ef70097b
commit 441284d297
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/datetime.h
View File

@@ -1262,7 +1262,7 @@ WX_DEFINE_EXPORTED_ARRAY(wxDateTimeHolidayAuthority *, wxHolidayAuthoritiesArray
class wxDateTimeHolidaysModule; class wxDateTimeHolidaysModule;
class WXDLLEXPORT wxDateTimeHolidayAuthority class WXDLLEXPORT wxDateTimeHolidayAuthority
{ {
friend wxDateTimeHolidaysModule; friend class wxDateTimeHolidaysModule;
public: public:
// returns TRUE if the given date is a holiday // returns TRUE if the given date is a holiday
static bool IsHoliday(const wxDateTime& dt); static bool IsHoliday(const wxDateTime& dt);

4
src/gtk/dcclient.cpp
View File

@@ -1284,8 +1284,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
for ( wxCoord srcY = 0; srcY < h; srcY++ ) for ( wxCoord srcY = 0; srcY < h; srcY++ )
{ {
// transform source coords to dest coords // transform source coords to dest coords
double r = sqrt(srcX*srcX + srcY*srcY); double r = sqrt((double)srcX*srcX + srcY*srcY);
double angleOrig = atan2(srcY, srcX) - rad; double angleOrig = atan2((double)srcY, (double)srcX) - rad;
wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5), wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
dstY = (wxCoord)(r*sin(angleOrig) + 0.5); dstY = (wxCoord)(r*sin(angleOrig) + 0.5);

4
src/gtk1/dcclient.cpp
View File

@@ -1284,8 +1284,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
for ( wxCoord srcY = 0; srcY < h; srcY++ ) for ( wxCoord srcY = 0; srcY < h; srcY++ )
{ {
// transform source coords to dest coords // transform source coords to dest coords
double r = sqrt(srcX*srcX + srcY*srcY); double r = sqrt((double)srcX*srcX + srcY*srcY);
double angleOrig = atan2(srcY, srcX) - rad; double angleOrig = atan2((double)srcY, (double)srcX) - rad;
wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5), wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
dstY = (wxCoord)(r*sin(angleOrig) + 0.5); dstY = (wxCoord)(r*sin(angleOrig) + 0.5);