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

no changes (0 -> NULL)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-04 12:01:37 +00:00
parent c3dfaa10a6
commit 3f0fb1d416
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/region.cpp
View File

@@ -470,14 +470,15 @@ struct _XRegion {
class wxRIRefData: public wxObjectRefData class wxRIRefData: public wxObjectRefData
{ {
public: public:
wxRIRefData() { Init(); }
virtual ~wxRIRefData();
wxRIRefData() : m_rects(0), m_numRects(0){} void CreateRects( const wxRegion& r );
~wxRIRefData();
void Init() { m_rects = NULL; m_numRects = 0; }
wxRect *m_rects; wxRect *m_rects;
size_t m_numRects; size_t m_numRects;
void CreateRects( const wxRegion& r );
}; };
wxRIRefData::~wxRIRefData() wxRIRefData::~wxRIRefData()
@@ -487,14 +488,13 @@ wxRIRefData::~wxRIRefData()
void wxRIRefData::CreateRects( const wxRegion& region ) void wxRIRefData::CreateRects( const wxRegion& region )
{ {
if (m_rects) delete m_rects;
delete m_rects;
m_rects = 0; Init();
m_numRects = 0;
GdkRegion *gdkregion = region.GetRegion(); GdkRegion *gdkregion = region.GetRegion();
if (!gdkregion) return; if (!gdkregion)
return;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GdkRectangle *gdkrects = NULL; GdkRectangle *gdkrects = NULL;

18
src/gtk1/region.cpp
View File

@@ -470,14 +470,15 @@ struct _XRegion {
class wxRIRefData: public wxObjectRefData class wxRIRefData: public wxObjectRefData
{ {
public: public:
wxRIRefData() { Init(); }
virtual ~wxRIRefData();
wxRIRefData() : m_rects(0), m_numRects(0){} void CreateRects( const wxRegion& r );
~wxRIRefData();
void Init() { m_rects = NULL; m_numRects = 0; }
wxRect *m_rects; wxRect *m_rects;
size_t m_numRects; size_t m_numRects;
void CreateRects( const wxRegion& r );
}; };
wxRIRefData::~wxRIRefData() wxRIRefData::~wxRIRefData()
@@ -487,14 +488,13 @@ wxRIRefData::~wxRIRefData()
void wxRIRefData::CreateRects( const wxRegion& region ) void wxRIRefData::CreateRects( const wxRegion& region )
{ {
if (m_rects) delete m_rects;
delete m_rects;
m_rects = 0; Init();
m_numRects = 0;
GdkRegion *gdkregion = region.GetRegion(); GdkRegion *gdkregion = region.GetRegion();
if (!gdkregion) return; if (!gdkregion)
return;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GdkRectangle *gdkrects = NULL; GdkRectangle *gdkrects = NULL;