SVN Commit by dpage: r4704 - in trunk/pgadmin3/src: include utils

Author: dpage
Date: 2005-11-08 16:31:58 +0000 (Tue, 08 Nov 2005)
New Revision: 4704

Modified:
trunk/pgadmin3/src/include/sysSettings.h
trunk/pgadmin3/src/utils/sysSettings.cpp
Log:
Prevent assert on startup in debug builds on Windows.

Modified: trunk/pgadmin3/src/include/sysSettings.h
===================================================================
--- trunk/pgadmin3/src/include/sysSettings.h 2005-11-08 08:40:04 UTC (rev 4703)
+++ trunk/pgadmin3/src/include/sysSettings.h 2005-11-08 16:31:58 UTC (rev 4704)
@@ -25,8 +25,8 @@
~sysSettings();

// Tip Of The Day
- bool GetShowTipOfTheDay() const { return showTipOfTheDay; }
- void SetShowTipOfTheDay(const bool newval);
+ int GetShowTipOfTheDay() const { return showTipOfTheDay; }
+ void SetShowTipOfTheDay(const int newval);
int GetNextTipOfTheDay() const { return nextTipOfTheDay; }
void SetNextTipOfTheDay(const int newval);

@@ -151,7 +151,7 @@
wxFont systemFont, sqlFont;

// Tip Of The Day
- bool showTipOfTheDay;
+ int showTipOfTheDay;
int nextTipOfTheDay;

// Log

Modified: trunk/pgadmin3/src/utils/sysSettings.cpp
===================================================================
--- trunk/pgadmin3/src/utils/sysSettings.cpp 2005-11-08 08:40:04 UTC (rev 4703)
+++ trunk/pgadmin3/src/utils/sysSettings.cpp 2005-11-08 16:31:58 UTC (rev 4704)
@@ -33,7 +33,7 @@
sysSettings::sysSettings(const wxString& name) : wxConfig(name)
{
// Tip Of The Day
- Read(wxT("ShowTipOfTheDay"), &showTipOfTheDay, true);
+ Read(wxT("ShowTipOfTheDay"), &showTipOfTheDay, 1);
Read(wxT("NextTipOfTheDay"), &nextTipOfTheDay, 0);

// Log. Try to get a vaguely usable default path.
@@ -278,7 +278,7 @@
// Tip of the Day
//////////////////////////////////////////////////////////////////////////

-void sysSettings::SetShowTipOfTheDay(const bool newval)
+void sysSettings::SetShowTipOfTheDay(const int newval)
{
showTipOfTheDay = newval;
Write(wxT("ShowTipOfTheDay"), showTipOfTheDay);