new compile option added: USE_WXCONFIG. If it's 1, wxApp has a virtual

wxConfig *CreateConfig() function which can be overloaded to create a global
config object (current implementation simply returns NULL for now).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 11af9c490344bfce010ff60bfec03aed79b9249c..6e79190ab468c2b0fbc22c8e19fd3b8210166cff 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -24,6 +24,7 @@
 
 class wxApp;
 class wxLog;
+class wxConfig; // it's not used #if !USE_WXCONFIG, but fwd decl doesn't harm
 
 //-----------------------------------------------------------------------------
 // global data
@@ -97,6 +98,12 @@ class wxApp: public wxEvtHandler
     // user-defined classv (default implementation creates a wxLogGui object)
     virtual wxLog *CreateLogTarget();
     
+#if USE_WXCONFIG
+    // override this function to create a global wxConfig object of different
+    // than default type (right now the default implementation returns NULL)
+    virtual wxConfig *CreateConfig() { return NULL; }
+#endif
+    
     bool          m_initialized;
     bool          m_exitOnFrameDelete;
     gint          m_idleTag;

diff --git a/include/wx/gtk/setup.h b/include/wx/gtk/setup.h
index aafc14035f70decd589f34683b5644576826e111..8f2b73a8d85453a34ed6d384b289ee19c6428dd1 100644 (file)
--- a/include/wx/gtk/setup.h
+++ b/include/wx/gtk/setup.h
@@ -176,6 +176,11 @@
  * Use wxTree
  */
 
+/*
+ * Use wxConfig profile management classes (wxFileConfig only under Unix)
+ */
+#define USE_WXCONFIG 1
+
 /********************** DO NOT CHANGE BELOW THIS POINT **********************/
 
 /**************************** DEBUGGING FEATURES ****************************/
@@ -188,7 +193,7 @@
 /*
  * Enables debugging: memory tracing, assert, etc.
  */
-/* #undef DEBUG */
+#define DEBUG 1
 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF DEBUG)
  * WARNING: this code may not work with all architectures, especially

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 11af9c490344bfce010ff60bfec03aed79b9249c..6e79190ab468c2b0fbc22c8e19fd3b8210166cff 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -24,6 +24,7 @@
 
 class wxApp;
 class wxLog;
+class wxConfig; // it's not used #if !USE_WXCONFIG, but fwd decl doesn't harm
 
 //-----------------------------------------------------------------------------
 // global data
@@ -97,6 +98,12 @@ class wxApp: public wxEvtHandler
     // user-defined classv (default implementation creates a wxLogGui object)
     virtual wxLog *CreateLogTarget();
     
+#if USE_WXCONFIG
+    // override this function to create a global wxConfig object of different
+    // than default type (right now the default implementation returns NULL)
+    virtual wxConfig *CreateConfig() { return NULL; }
+#endif
+    
     bool          m_initialized;
     bool          m_exitOnFrameDelete;
     gint          m_idleTag;

diff --git a/include/wx/gtk1/setup.h b/include/wx/gtk1/setup.h
index aafc14035f70decd589f34683b5644576826e111..8f2b73a8d85453a34ed6d384b289ee19c6428dd1 100644 (file)
--- a/include/wx/gtk1/setup.h
+++ b/include/wx/gtk1/setup.h
@@ -176,6 +176,11 @@
  * Use wxTree
  */
 
+/*
+ * Use wxConfig profile management classes (wxFileConfig only under Unix)
+ */
+#define USE_WXCONFIG 1
+
 /********************** DO NOT CHANGE BELOW THIS POINT **********************/
 
 /**************************** DEBUGGING FEATURES ****************************/
@@ -188,7 +193,7 @@
 /*
  * Enables debugging: memory tracing, assert, etc.
  */
-/* #undef DEBUG */
+#define DEBUG 1
 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF DEBUG)
  * WARNING: this code may not work with all architectures, especially