Applied patch #886192: "Minor fix to XRC contrib"; Minor cosmetic cleanups.

[wxWidgets.git] / src / common / sysopt.cpp

diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index c8d4539f3777eae0a145096aae3d59cc582c73b0..aa36947d7bb35cdcae11ea3d5cbb78555b7c9d61 100644 (file)
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

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

     #pragma implementation "sysopt.h"
 #endif
 
     #pragma implementation "sysopt.h"
 #endif
 


@@ -37,6 +37,7 @@
 #include "wx/string.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"
 #include "wx/string.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"

+#include "wx/arrstr.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -46,7 +47,7 @@
 // singleton class so it can't be done in the dtor)
 class wxSystemOptionsModule : public wxModule
 {
 // singleton class so it can't be done in the dtor)
 class wxSystemOptionsModule : public wxModule
 {

-    friend class wxSystemOptions;
+    friend class WXDLLIMPEXP_BASE wxSystemOptions;

 public:
     virtual bool OnInit();
     virtual void OnExit();
 public:
     virtual bool OnInit();
     virtual void OnExit();