removed GSocket_[Un]Streamed(), GSocket_SetNonOriented() must be used instead

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

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index b00ac59e49d23fcfac35bd9ba5c7b5cd6bea40af..ea5eab449352c3506bd035c4b9b02170eeb3f352 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -13,7 +13,7 @@
 #ifndef   _FILECONF_H
 #define   _FILECONF_H
 
 #ifndef   _FILECONF_H
 #define   _FILECONF_H
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "fileconf.h"
 #endif
 
 #pragma interface "fileconf.h"
 #endif
 


@@ -23,6 +23,7 @@
 
 #include "wx/textfile.h"
 #include "wx/string.h"
 
 #include "wx/textfile.h"
 #include "wx/string.h"

+#include "wx/confbase.h"

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


@@ -120,7 +121,7 @@ public:
                const wxString& vendorName = wxEmptyString,
                const wxString& localFilename = wxEmptyString,
                const wxString& globalFilename = wxEmptyString,
                const wxString& vendorName = wxEmptyString,
                const wxString& localFilename = wxEmptyString,
                const wxString& globalFilename = wxEmptyString,

-               long style = wxCONFIG_USE_LOCAL_FILE,
+               long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE,

                wxMBConv& conv = wxConvUTF8);
 
 #if wxUSE_STREAMS
                wxMBConv& conv = wxConvUTF8);
 
 #if wxUSE_STREAMS