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

Fix some GCC 3.1 compilation warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-07-05 16:45:15 +00:00
parent d3f3e8575a
commit d285d708a2
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/dc.cpp
View File

@@ -1129,13 +1129,13 @@ void wxDC::DoDrawRotatedText(const wxString& text,
// "upper left" and "upper right" // "upper left" and "upper right"
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + w*cos(rad), y - h*sin(rad)); CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(h*sin(rad)));
// "bottom left" and "bottom right" // "bottom left" and "bottom right"
x += (wxCoord)(h*sin(rad)); x += (wxCoord)(h*sin(rad));
y += (wxCoord)(h*cos(rad)); y += (wxCoord)(h*cos(rad));
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); CalcBoundingBox(x + wxCoord(h*sin(rad)), y + wxCoord(h*cos(rad)));
} }
#endif #endif
} }

2
src/msw/settings.cpp
View File

@@ -187,7 +187,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
} }
else // replace with default colour else // replace with default colour
{ {
int n = index - wxSYS_COLOUR_BTNHIGHLIGHT; unsigned int n = index - wxSYS_COLOUR_BTNHIGHLIGHT;
wxASSERT_MSG( n < WXSIZEOF(s_defaultSysColors), wxASSERT_MSG( n < WXSIZEOF(s_defaultSysColors),
_T("forgot tp update the default colours array") ); _T("forgot tp update the default colours array") );

2
src/msw/toplevel.cpp
View File

@@ -244,7 +244,7 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
parent = ms_hiddenParent; parent = ms_hiddenParent;
} }
return parent ? parent->GetHWND() : NULL; return parent ? parent->GetHWND() : WXHWND(NULL);
} }
bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,

2
src/msw/window.cpp
View File

@@ -2955,7 +2955,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
WXHWND wxWindowMSW::MSWGetParent() const WXHWND wxWindowMSW::MSWGetParent() const
{ {
return m_parent ? m_parent->GetHWND() : NULL; return m_parent ? m_parent->GetHWND() : WXHWND(NULL);
} }
bool wxWindowMSW::MSWCreate(const wxChar *wclass, bool wxWindowMSW::MSWCreate(const wxChar *wclass,