AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implemented explicit copy constructor and assignement operator

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot 2002-05-07 20:40:04 +00:00
parent 26ddbfd329
commit 54380f29f0
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/accel.h
View File

@ -44,10 +44,25 @@ class WXDLLEXPORT wxAcceleratorEntry
public:
wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0,
wxMenuItem *item = NULL)
{
Set(flags, keyCode, cmd, item);
}
: m_flags(flags)
, m_keyCode(keyCode)
, m_command(cmd)
, m_item(item)
{ }
wxAcceleratorEntry(const wxAcceleratorEntry& entry)
: m_flags(entry.m_flags)
, m_keyCode(entry.m_keyCode)
, m_command(entry.m_command)
, m_item(entry.m_item)
{ }
wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)
{
Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
return *this;
}
void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL)
{
m_flags = flags;

3
include/wx/strconv.h
View File

@ -124,8 +124,11 @@ class WXDLLEXPORT wxCSConv : public wxMBConv
{
public:
wxCSConv(const wxChar *charset);
wxCSConv(const wxCSConv& conv);
virtual ~wxCSConv();
wxCSConv& operator=(const wxCSConv& conv);
void LoadNow();
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;

14
src/common/strconv.cpp
View File

@ -920,6 +920,20 @@ wxCSConv::~wxCSConv()
Clear();
}
wxCSConv::wxCSConv(const wxCSConv& conv)
: wxMBConv()
{
Clear();
SetName(conv.m_name);
}
wxCSConv& wxCSConv::operator=(const wxCSConv& conv)
{
Clear();
SetName(conv.m_name);
return *this;
}
void wxCSConv::Clear()
{
if (m_name)