make construct simpler

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f6195cfeb2af67fe79531458c149a35652ba8bf6..449bafe65fea735a240a8776d68455f8c0dd87dc 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -17,7 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma implementation "utils.h"
 #endif
 
@@ -293,12 +300,12 @@ int wxGetOsVersion(int *verMaj, int *verMin)
     if ( ! traits )
         traits = &traitsConsole;
 
-    wxToolkitInfo *info = traits->GetToolkitInfo();
+    wxToolkitInfo& info = traits->GetToolkitInfo();
     if ( verMaj )
-        *verMaj = info->versionMajor;
+        *verMaj = info.versionMajor;
     if ( verMin )
-        *verMin = info->versionMinor;
-    return info->os;
+        *verMin = info.versionMinor;
+    return info.os;
 }
 
 // ----------------------------------------------------------------------------