better-looking icons

[wxWidgets.git] / include / wx / fileconf.h

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index d5e34274d434a7265c4fd151bf6467cdf7e16fd4..42da068138840637528803d9540bbea33c684be0 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -18,17 +18,11 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/textfile.h"
-#include "wx/string.h"

 
 

-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#if wxUSE_CONFIG

 
 

-// it won't compile without it anyhow
-#ifndef wxUSE_CONFIG
-  #error "Please define wxUSE_CONFIG or remove fileconf.cpp from your makefile"
-#endif // wxUSE_CONFIG
+#include "wx/textfile.h"
+#include "wx/string.h"

 
 // ----------------------------------------------------------------------------
 // wxFileConfig
 
 // ----------------------------------------------------------------------------
 // wxFileConfig


@@ -147,9 +141,9 @@ public:
     // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
     // wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
   wxFileConfig(const wxString& appName,
     // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
     // wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
   wxFileConfig(const wxString& appName,

-               const wxString& vendorName = _T(""),
-               const wxString& localFilename = _T(""),
-               const wxString& globalFilename = _T(""),
+               const wxString& vendorName = wxT(""),
+               const wxString& localFilename = wxT(""),
+               const wxString& globalFilename = wxT(""),

                long style = wxCONFIG_USE_LOCAL_FILE);
 
     // dtor will save unsaved data
                long style = wxCONFIG_USE_LOCAL_FILE);
 
     // dtor will save unsaved data


@@ -349,5 +343,9 @@ public:
   void SetLastGroup(ConfigGroup *pGroup) { m_pLastGroup = pGroup; }
 };
 
   void SetLastGroup(ConfigGroup *pGroup) { m_pLastGroup = pGroup; }
 };
 

-#endif  //_FILECONF_H
+#endif
+  // wxUSE_CONFIG
+
+#endif  
+  //_FILECONF_H