Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv4520/src/gui
Modified Files:
wxSpamOptions.cpp
Log Message:
Fixed harmless memory allocation bugs
Index: wxSpamOptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSpamOptions.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- wxSpamOptions.cpp 26 Sep 2003 09:33:44 -0000 1.6
+++ wxSpamOptions.cpp 2 Oct 2003 09:49:38 -0000 1.7
@@ -28,4 +28,5 @@
# include "Mcommon.h"
# include "strutil.h"
+# include "miscutil.h"
# include "Profile.h"
# include "MApplication.h"
@@ -203,5 +204,4 @@
public:
SpamOptionManagerBody();
- virtual ~SpamOptionManagerBody();
virtual void FromString(const String &source);
@@ -223,6 +223,8 @@
size_t ConfigEntryCount() const { return ms_count+1; }
- ConfigValueDefault *m_configValues;
- wxOptionsPage::FieldInfo *m_fieldInfo;
+ BOUND_ARRAY(ConfigValueNone,ConfigValueArray);
+ ConfigValueArray m_configValues;
+ BOUND_ARRAY(wxOptionsPage::FieldInfo,FieldInfoArray);
+ FieldInfoArray m_fieldInfo;
SpamOptionAssassin m_checkSpamAssassin;
@@ -308,4 +310,7 @@
+IMPLEMENT_BOUND_ARRAY(SpamOptionManagerBody::ConfigValueArray)
+IMPLEMENT_BOUND_ARRAY(SpamOptionManagerBody::FieldInfoArray)
+
SpamOptionManagerBody::SpamOptionManagerBody()
{
@@ -314,10 +319,4 @@
}
-SpamOptionManagerBody::~SpamOptionManagerBody()
-{
- delete m_fieldInfo;
- delete m_configValues;
-}
-
void SpamOptionManagerBody::SetDefaults()
{
@@ -419,10 +418,11 @@
void SpamOptionManagerBody::BuildConfigValues()
{
- m_configValues = new ConfigValueNone[ConfigEntryCount()];
+ m_configValues.Initialize(ConfigEntryCount());
for ( SpamOptionManagerBody::Iterator option(this);
!option.IsEnd(); ++option )
{
- m_configValues[option.Index()+1] = ConfigValueDefault(
+ ConfigValueDefault &value = m_configValues[option.Index()+1];
+ value = ConfigValueDefault(
option->ProfileHackName(),option->DefaultValue());
}
@@ -431,5 +431,5 @@
void SpamOptionManagerBody::BuildFieldInfo()
{
- m_fieldInfo = new wxOptionsPage::FieldInfo[ConfigEntryCount()];
+ m_fieldInfo.Initialize(ConfigEntryCount());
m_fieldInfo[0].label
@@ -470,6 +470,6 @@
// the fields description
- m_fieldInfo,
- m_configValues,
+ m_fieldInfo.Get(),
+ m_configValues.Get(),
ConfigEntryCount()
);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
