wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

[wxWidgets.git] / include / wx / msw / regconf.h

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index f34b2651701b171435e67e189298e216cf208343..3c83e70c9832d40e49660cad4b0d96c7d0c2401c 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -12,7 +12,7 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 

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

 #pragma interface "regconf.h"
 #endif
 
 #pragma interface "regconf.h"
 #endif
 


@@ -34,7 +34,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 = 0);
+              long style = wxCONFIG_USE_GLOBAL_FILE);

 
     // dtor will save unsaved data
   virtual ~wxRegConfig();
 
     // dtor will save unsaved data
   virtual ~wxRegConfig();