git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31467
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
}
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_style = data.m_style;
m_colour(data.m_colour)
{
m_style = data.m_style;
}
wxColour::wxColour(const wxColour& col)
}
wxColour::wxColour(const wxColour& col)
- wxFontRefData(const wxFontRefData& data)
+ wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
{
if ( data.m_nativeFontInfoOk )
{
{
if ( data.m_nativeFontInfoOk )
{
}
wxPenRefData::wxPenRefData(const wxPenRefData& data)
}
wxPenRefData::wxPenRefData(const wxPenRefData& data)
{
m_style = data.m_style;
m_width = data.m_width;
{
m_style = data.m_style;
m_width = data.m_width;
- wxRegionRefData(const wxRegionRefData& data)
+ wxRegionRefData(const wxRegionRefData& data) : wxGDIRefData()
{
#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL);
{
#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL);
if ( !QueryValue(name, &value) )
break;
if ( !QueryValue(name, &value) )
break;
- rhs.Printf(_T("dword:%08x"), value);
+ rhs.Printf(_T("dword:%08x"), (unsigned int)value);
}
//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);
// Walk the snapshot of the processes, and for each process,
pe.dwSize = sizeof(PROCESSENTRY32);
// Walk the snapshot of the processes, and for each process,
// There don't seem to be symbolic names for
// these under Windows so I just copied the
// values from MSDN.
// There don't seem to be symbolic names for
// these under Windows so I just copied the
// values from MSDN.
switch (encoding)
{
case wxFONTENCODING_ISO8859_1: ret = 28591; break;
switch (encoding)
{
case wxFONTENCODING_ISO8859_1: ret = 28591; break;
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_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;
case wxFONTENCODING_ISO8859_14: ret = 28604; break;
case wxFONTENCODING_ISO8859_15: ret = 28605; break;
case wxFONTENCODING_KOI8: ret = 20866; break;
case wxFONTENCODING_UTF8: ret = 65001; break;
default: return -1;
}
case wxFONTENCODING_UTF8: ret = 65001; break;
default: return -1;
}
if (::IsValidCodePage(ret) == 0)
return -1;
if (::IsValidCodePage(ret) == 0)
return -1;
CPINFO info;
if (::GetCPInfo(ret, &info) == 0)
return -1;
CPINFO info;
if (::GetCPInfo(ret, &info) == 0)
return -1;