From d285d708a229ece6ad606a460bcbf048c65d252b Mon Sep 17 00:00:00 2001
From: Mattia Barbon <mbarbon@cpan.org>
Date: Fri, 5 Jul 2002 16:45:15 +0000
Subject: [PATCH] Fix some GCC 3.1 compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/msw/dc.cpp | 4 ++--
src/msw/settings.cpp | 2 +-
src/msw/toplevel.cpp | 2 +-
src/msw/window.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 293626093c..e533015783 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1129,13 +1129,13 @@ void wxDC::DoDrawRotatedText(const wxString& text,
// "upper left" and "upper right"
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"
x += (wxCoord)(h*sin(rad));
y += (wxCoord)(h*cos(rad));
CalcBoundingBox(x, y);
- CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+ CalcBoundingBox(x + wxCoord(h*sin(rad)), y + wxCoord(h*cos(rad)));
}
#endif
}
diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 5cf3b79700..a621cc73e2 100644
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -187,7 +187,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
}
else // replace with default colour
{
- int n = index - wxSYS_COLOUR_BTNHIGHLIGHT;
+ unsigned int n = index - wxSYS_COLOUR_BTNHIGHLIGHT;
wxASSERT_MSG( n < WXSIZEOF(s_defaultSysColors),
_T("forgot tp update the default colours array") );
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index d737b9a679..9ce65687c6 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -244,7 +244,7 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
parent = ms_hiddenParent;
}
- return parent ? parent->GetHWND() : NULL;
+ return parent ? parent->GetHWND() : WXHWND(NULL);
}
bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 004d5d78bd..aba22e63b4 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2955,7 +2955,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
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,
--
2.47.2