From 04a18b0d958a3c7507089dc374e71bdad143981d Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 18 Jan 2005 20:13:00 +0000 Subject: [PATCH] MinGW warning fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/brush.cpp | 3 ++- src/msw/colour.cpp | 1 + src/msw/font.cpp | 2 +- src/msw/pen.cpp | 1 + src/msw/region.cpp | 2 +- src/msw/registry.cpp | 2 +- src/msw/utils.cpp | 13 +++++++------ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 29161607c3..07c11e9bdb 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -103,7 +103,8 @@ wxBrushRefData::wxBrushRefData(const wxBitmap& stipple) } wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) - : m_stipple(data.m_stipple), + : wxGDIRefData(), + m_stipple(data.m_stipple), m_colour(data.m_colour) { m_style = data.m_style; diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index e16e03408f..db8be10974 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -84,6 +84,7 @@ void wxColour::Init() } wxColour::wxColour(const wxColour& col) + :wxObject() { *this = col; } diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 9b40d9cb92..b18902071f 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -132,7 +132,7 @@ public: Init(info, hFont); } - wxFontRefData(const wxFontRefData& data) + wxFontRefData(const wxFontRefData& data) : wxGDIRefData() { if ( data.m_nativeFontInfoOk ) { diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index 93776357d4..ce9d1dc9e8 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -47,6 +47,7 @@ wxPenRefData::wxPenRefData() } wxPenRefData::wxPenRefData(const wxPenRefData& data) + :wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; diff --git a/src/msw/region.cpp b/src/msw/region.cpp index 4b88f32bd1..828fe82e64 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -48,7 +48,7 @@ public: m_region = 0; } - wxRegionRefData(const wxRegionRefData& data) + wxRegionRefData(const wxRegionRefData& data) : wxGDIRefData() { #if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL); diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index 0191ef8d82..70dd768c12 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -1231,7 +1231,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const if ( !QueryValue(name, &value) ) break; - rhs.Printf(_T("dword:%08x"), value); + rhs.Printf(_T("dword:%08x"), (unsigned int)value); } break; diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index ad156d3ffe..22c24572dc 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -895,7 +895,8 @@ int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc) } //Fill in the size of the structure before using it. - PROCESSENTRY32 pe = {0}; + PROCESSENTRY32 pe; + wxZeroMemory(pe); pe.dwSize = sizeof(PROCESSENTRY32); // Walk the snapshot of the processes, and for each process, @@ -1305,9 +1306,9 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) // There don't seem to be symbolic names for // these under Windows so I just copied the // values from MSDN. - + unsigned int ret; - + switch (encoding) { case wxFONTENCODING_ISO8859_1: ret = 28591; break; @@ -1322,7 +1323,7 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) case wxFONTENCODING_ISO8859_10: ret = 28600; break; case wxFONTENCODING_ISO8859_11: ret = 28601; break; // case wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it - case wxFONTENCODING_ISO8859_13: ret = 28603; break; + case wxFONTENCODING_ISO8859_13: ret = 28603; break; case wxFONTENCODING_ISO8859_14: ret = 28604; break; case wxFONTENCODING_ISO8859_15: ret = 28605; break; case wxFONTENCODING_KOI8: ret = 20866; break; @@ -1364,10 +1365,10 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) case wxFONTENCODING_UTF8: ret = 65001; break; default: return -1; } - + if (::IsValidCodePage(ret) == 0) return -1; - + CPINFO info; if (::GetCPInfo(ret, &info) == 0) return -1; -- 2.47.2