Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv27168/include
Modified Files:
ConfigSource.h
Log Message:
gcc compilation fixes after smartp ointers change
Index: ConfigSource.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ConfigSource.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- ConfigSource.h 27 Sep 2003 23:10:35 -0000 1.7
+++ ConfigSource.h 30 Sep 2003 13:46:19 -0000 1.8
@@ -340,5 +340,6 @@
@param filename the name of config file or empty to use the default one
*/
- static ConfigSourceLocal *CreateDefault(const String& filename = _T(""));
+ static ConfigSourceLocal *CreateDefault(const String& filename = _T(""))
+ { return new ConfigSourceLocal(CreateDefaultConfig(filename), _T("")); }
/**
@@ -398,5 +399,5 @@
wxConfigBase *GetConfig() const { return m_config; }
-private:
+protected:
#ifdef OS_WIN
// create wxRegConfig we use under Windows
@@ -408,5 +409,9 @@
const String& fnameGlobal = _T(""));
+ // create either wxRegConfig or wxFileConfig using the same logic as
+ // CreateDefault()
+ static wxConfigBase *CreateDefaultConfig(const String& filename);
+private:
// the config object we use
wxConfigBase *m_config;
-------------------------------------------------------
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
