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

corrected warnings when compiled with -Wall -W

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-05-08 13:17:53 +00:00
parent 97bbc535e7
commit 5e472c1f9f
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/cmndata.h
View File

@@ -58,6 +58,27 @@ public:
wxFontData(); wxFontData();
~wxFontData(); ~wxFontData();
wxFontData(const wxFontData& data)
: wxObject()
, fontColour(data.fontColour)
, showHelp(data.showHelp)
, allowSymbols(data.allowSymbols)
, enableEffects(data.enableEffects)
, initialFont(data.initialFont)
, chosenFont(data.chosenFont)
, minSize(data.minSize)
, maxSize(data.maxSize)
, m_encoding(data.m_encoding)
, m_encodingInfo(data.m_encodingInfo)
{
}
wxFontData& operator=(const wxFontData& data)
{
(*this) = data;
return *this;
}
void SetAllowSymbols(bool flag) { allowSymbols = flag; } void SetAllowSymbols(bool flag) { allowSymbols = flag; }
bool GetAllowSymbols() const { return allowSymbols; } bool GetAllowSymbols() const { return allowSymbols; }
@@ -380,8 +401,8 @@ public:
// Use paper id in wxPrintData to set this object's paper size // Use paper id in wxPrintData to set this object's paper size
void CalculatePaperSizeFromId(); void CalculatePaperSizeFromId();
void operator=(const wxPageSetupData& data); wxPageSetupDialogData& operator=(const wxPageSetupData& data);
void operator=(const wxPrintData& data); wxPageSetupDialogData& operator=(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }
void SetPrintData(const wxPrintData& printData) { m_printData = printData; } void SetPrintData(const wxPrintData& printData) { m_printData = printData; }

12
src/common/cmndata.cpp
View File

@@ -121,6 +121,7 @@ wxColourData::wxColourData()
} }
wxColourData::wxColourData(const wxColourData& data) wxColourData::wxColourData(const wxColourData& data)
: wxObject()
{ {
(*this) = data; (*this) = data;
} }
@@ -264,6 +265,7 @@ wxPrintData::wxPrintData()
} }
wxPrintData::wxPrintData(const wxPrintData& printData) wxPrintData::wxPrintData(const wxPrintData& printData)
: wxObject()
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
m_devMode = (void*) NULL; m_devMode = (void*) NULL;
@@ -878,6 +880,7 @@ wxPrintDialogData::wxPrintDialogData()
} }
wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData) wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
: wxObject()
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
m_printDlgData = NULL; m_printDlgData = NULL;
@@ -1172,6 +1175,7 @@ wxPageSetupDialogData::wxPageSetupDialogData()
} }
wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData) wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
: wxObject()
{ {
#if defined(__WIN95__) #if defined(__WIN95__)
m_pageSetupData = NULL; m_pageSetupData = NULL;
@@ -1219,7 +1223,7 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
#endif #endif
} }
void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data) wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
{ {
m_paperSize = data.m_paperSize; m_paperSize = data.m_paperSize;
m_minMarginTopLeft = data.m_minMarginTopLeft; m_minMarginTopLeft = data.m_minMarginTopLeft;
@@ -1235,11 +1239,15 @@ void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
m_enableHelp = data.m_enableHelp; m_enableHelp = data.m_enableHelp;
m_printData = data.m_printData; m_printData = data.m_printData;
return *this;
} }
void wxPageSetupDialogData::operator=(const wxPrintData& data) wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
{ {
m_printData = data; m_printData = data;
return *this;
} }
#if defined(__WIN95__) #if defined(__WIN95__)