Web pgadmin.org
 Home 
 ·  ·  ·  ·  ·  ·  · 
CVS Commit by andreas: Fix reading/writing bool config values

CVS Commit by andreas: Fix reading/writing bool config values



Log Message:
-----------
Fix reading/writing bool config values

Modified Files:
--------------
    pgadmin3/src/include:
        sysSettings.h (r1.37 -> r1.38)
    pgadmin3/src/ui:
        frmMain.cpp (r1.124 -> r1.125)
    pgadmin3/src/utils:
        sysSettings.cpp (r1.69 -> r1.70)

Index: sysSettings.h
===================================================================
RCS file: /projects/pgadmin3/src/include/sysSettings.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lsrc/include/sysSettings.h -Lsrc/include/sysSettings.h -u -w -r1.37 -r1.38
--- src/include/sysSettings.h
+++ src/include/sysSettings.h
@@ -109,6 +109,8 @@
 
     bool Write(const wxString &key, const wxString &value) { return wxConfig::Write(key, value); }
     bool Write(const wxString &key, long value) { return wxConfig::Write(key, value); }
+    bool Write(const wxString &key, int value) { return wxConfig::Write(key, value); }
+    bool Write(const wxString &key, bool value);
     bool Write(const wxString &key, const wxPoint &value);
     bool Write(const wxString &key, const wxSize &value);
     bool Write(const wxString &key, const wxSize &size, const wxPoint &point)
@@ -116,8 +118,7 @@
 
     bool Read(const wxString& key, wxString* str, const wxString& defaultVal) const
         { return wxConfig::Read(key, str, defaultVal); }
-    bool Read(const wxString& key, bool* str, bool defaultVal) const
-        { return wxConfig::Read(key, str, defaultVal); }
+    bool Read(const wxString& key, bool* str, bool defaultVal) const;
     bool Read(const wxString& key, int* i, int defaultVal) const
         { return wxConfig::Read(key, i, defaultVal); }
     bool Read(const wxString& key, long* l, long defaultVal) const
Index: frmMain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.124 -r1.125
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -855,7 +855,7 @@
 
 			// Trusted
 			key.Printf(wxT("Servers/Trusted%d"), numServers);
-	        settings->Write(key, BoolToStr(server->GetTrusted()));
+	        settings->Write(key, server->GetTrusted());
 
 			// Database
 			key.Printf(wxT("Servers/Database%d"), numServers);
Index: sysSettings.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.69 -r1.70
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -197,6 +197,19 @@
 }
 
 
+bool sysSettings::Read(const wxString& key, bool *val, bool defaultVal) const
+{
+    wxString str;
+    Read(key, &str, BoolToStr(defaultVal));
+	*val = StrToBool(str);
+	return true;
+}
+
+bool sysSettings::Write(const wxString &key, bool value)
+{
+    Write(key, BoolToStr(value));
+}
+
 bool sysSettings::Write(const wxString &key, const wxPoint &value)
 {
     bool rc=wxConfig::Write(key + wxT("/Left"), value.x);


Home | Main Index | Thread Index

top