paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix dangling pointer in Atlas

Browse Source 
This was SVN commit r10866.
This commit is contained in:
Ykkrosh 2012-01-04 13:18:45 +00:00
parent f73e3c7668
commit c1c741be9a
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp
View File

@ -23,6 +23,10 @@
#include "wx/spinctrl.h"
Brush g_Brush_Elevation; // shared between several elevation-related tools; other tools have their own brushes
static Brush* g_Brush_CurrentlyActive = NULL; // only one brush can be active at once
Brush::Brush()
: m_Shape(CIRCLE), m_Size(4), m_Strength(1.f), m_IsActive(false)
{
@ -30,6 +34,26 @@ Brush::Brush()
Brush::~Brush()
{
// Avoid dangling pointers
if (g_Brush_CurrentlyActive == this)
g_Brush_CurrentlyActive = NULL;
}
void Brush::MakeActive()
{
if (g_Brush_CurrentlyActive)
g_Brush_CurrentlyActive->m_IsActive = false;
g_Brush_CurrentlyActive = this;
m_IsActive = true;
Send();
}
void Brush::Send()
{
if (m_IsActive)
POST_MESSAGE(Brush, (GetWidth(), GetHeight(), GetData()));
}
int Brush::GetWidth() const
@ -223,25 +247,4 @@ void Brush::CreateUI(wxWindow* parent, wxSizer* sizer)
spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Strength")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT));
spinnerSizer->Add(new BrushStrengthCtrl(parent, *this), wxSizerFlags().Expand());
sizer->Add(spinnerSizer, wxSizerFlags().Expand());
}
void Brush::MakeActive()
{
if (g_Brush_CurrentlyActive)
g_Brush_CurrentlyActive->m_IsActive = false;
g_Brush_CurrentlyActive = this;
m_IsActive = true;
Send();
}
void Brush::Send()
{
if (m_IsActive)
POST_MESSAGE(Brush, (GetWidth(), GetHeight(), GetData()));
}
Brush g_Brush_Elevation;
Brush* g_Brush_CurrentlyActive = NULL;
}

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h
View File

@ -62,6 +62,4 @@ private:
extern Brush g_Brush_Elevation;
extern Brush* g_Brush_CurrentlyActive;
#endif // INCLUDED_BRUSHES