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

MinGW warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-18 20:13:00 +00:00
parent a09cd1895e
commit 04a18b0d95
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/msw/brush.cpp
View File

@@ -103,7 +103,8 @@ wxBrushRefData::wxBrushRefData(const wxBitmap& stipple)
} }
wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
: m_stipple(data.m_stipple), : wxGDIRefData(),
m_stipple(data.m_stipple),
m_colour(data.m_colour) m_colour(data.m_colour)
{ {
m_style = data.m_style; m_style = data.m_style;

1
src/msw/colour.cpp
View File

@@ -84,6 +84,7 @@ void wxColour::Init()
} }
wxColour::wxColour(const wxColour& col) wxColour::wxColour(const wxColour& col)
:wxObject()
{ {
*this = col; *this = col;
} }

2
src/msw/font.cpp
View File

@@ -132,7 +132,7 @@ public:
Init(info, hFont); Init(info, hFont);
} }
wxFontRefData(const wxFontRefData& data) wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
{ {
if ( data.m_nativeFontInfoOk ) if ( data.m_nativeFontInfoOk )
{ {

1
src/msw/pen.cpp
View File

@@ -47,6 +47,7 @@ wxPenRefData::wxPenRefData()
} }
wxPenRefData::wxPenRefData(const wxPenRefData& data) wxPenRefData::wxPenRefData(const wxPenRefData& data)
:wxGDIRefData()
{ {
m_style = data.m_style; m_style = data.m_style;
m_width = data.m_width; m_width = data.m_width;

2
src/msw/region.cpp
View File

@@ -48,7 +48,7 @@ public:
m_region = 0; m_region = 0;
} }
wxRegionRefData(const wxRegionRefData& data) wxRegionRefData(const wxRegionRefData& data) : wxGDIRefData()
{ {
#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL); DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL);

2
src/msw/registry.cpp
View File

@@ -1231,7 +1231,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const
if ( !QueryValue(name, &value) ) if ( !QueryValue(name, &value) )
break; break;
rhs.Printf(_T("dword:%08x"), value); rhs.Printf(_T("dword:%08x"), (unsigned int)value);
} }
break; break;

13
src/msw/utils.cpp
View File

@@ -895,7 +895,8 @@ int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc)
} }
//Fill in the size of the structure before using it. //Fill in the size of the structure before using it.
PROCESSENTRY32 pe = {0}; PROCESSENTRY32 pe;
wxZeroMemory(pe);
pe.dwSize = sizeof(PROCESSENTRY32); pe.dwSize = sizeof(PROCESSENTRY32);
// Walk the snapshot of the processes, and for each process, // 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 // There don't seem to be symbolic names for
// these under Windows so I just copied the // these under Windows so I just copied the
// values from MSDN. // values from MSDN.
unsigned int ret; unsigned int ret;
switch (encoding) switch (encoding)
{ {
case wxFONTENCODING_ISO8859_1: ret = 28591; break; 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_10: ret = 28600; break;
case wxFONTENCODING_ISO8859_11: ret = 28601; break; case wxFONTENCODING_ISO8859_11: ret = 28601; break;
// case wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it // 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_14: ret = 28604; break;
case wxFONTENCODING_ISO8859_15: ret = 28605; break; case wxFONTENCODING_ISO8859_15: ret = 28605; break;
case wxFONTENCODING_KOI8: ret = 20866; break; case wxFONTENCODING_KOI8: ret = 20866; break;
@@ -1364,10 +1365,10 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
case wxFONTENCODING_UTF8: ret = 65001; break; case wxFONTENCODING_UTF8: ret = 65001; break;
default: return -1; default: return -1;
} }
if (::IsValidCodePage(ret) == 0) if (::IsValidCodePage(ret) == 0)
return -1; return -1;
CPINFO info; CPINFO info;
if (::GetCPInfo(ret, &info) == 0) if (::GetCPInfo(ret, &info) == 0)
return -1; return -1;