Fixes for CControl derived classes
CControl has a virtual destructor and constructor without side effects, so problem of double calls can be fixed (unlike issue #8)dev-ui
parent
57a51c7a29
commit
39f32f2a14
|
@ -42,8 +42,6 @@
|
||||||
|
|
||||||
CButton::CButton(CInstanceManager* iMan) : CControl(iMan)
|
CButton::CButton(CInstanceManager* iMan) : CControl(iMan)
|
||||||
{
|
{
|
||||||
CControl::CControl(iMan);
|
|
||||||
|
|
||||||
m_bCapture = FALSE;
|
m_bCapture = FALSE;
|
||||||
m_bImmediat = FALSE;
|
m_bImmediat = FALSE;
|
||||||
m_bRepeat = FALSE;
|
m_bRepeat = FALSE;
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CButton : public CControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CButton(CInstanceManager* iMan);
|
CButton(CInstanceManager* iMan);
|
||||||
~CButton();
|
virtual ~CButton();
|
||||||
|
|
||||||
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
|
|
||||||
CCheck::CCheck(CInstanceManager* iMan) : CControl(iMan)
|
CCheck::CCheck(CInstanceManager* iMan) : CControl(iMan)
|
||||||
{
|
{
|
||||||
CControl::CControl(iMan);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Object's destructor.
|
// Object's destructor.
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CCheck : public CControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CCheck(CInstanceManager* iMan);
|
CCheck(CInstanceManager* iMan);
|
||||||
~CCheck();
|
virtual ~CCheck();
|
||||||
|
|
||||||
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
||||||
|
|
||||||
|
|
|
@ -42,8 +42,6 @@
|
||||||
|
|
||||||
CColor::CColor(CInstanceManager* iMan) : CControl(iMan)
|
CColor::CColor(CInstanceManager* iMan) : CControl(iMan)
|
||||||
{
|
{
|
||||||
CControl::CControl(iMan);
|
|
||||||
|
|
||||||
m_bRepeat = FALSE;
|
m_bRepeat = FALSE;
|
||||||
m_repeat = 0.0f;
|
m_repeat = 0.0f;
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ class CColor : public CControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CColor(CInstanceManager* iMan);
|
CColor(CInstanceManager* iMan);
|
||||||
~CColor();
|
virtual ~CColor();
|
||||||
|
|
||||||
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
||||||
|
|
||||||
|
|
|
@ -36,8 +36,6 @@
|
||||||
|
|
||||||
CCompass::CCompass(CInstanceManager* iMan) : CControl(iMan)
|
CCompass::CCompass(CInstanceManager* iMan) : CControl(iMan)
|
||||||
{
|
{
|
||||||
CControl::CControl(iMan);
|
|
||||||
|
|
||||||
m_dir = 0.0f;
|
m_dir = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CCompass : public CControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CCompass(CInstanceManager* iMan);
|
CCompass(CInstanceManager* iMan);
|
||||||
~CCompass();
|
virtual ~CCompass();
|
||||||
|
|
||||||
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue