Latest distutils

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 3a3f03a76c50cf65ce1a7ac09acf12b46ad75586..e3de12da518ca709c3f46560a091c463b98a7f02 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -144,7 +144,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
-#ifndef __WXMICROWIN__
+#if !defined( __WXMICROWIN__) && wxUSE_DYNAMIC_LOADER
     // TODO should use GetComputerNameEx() when available
 
     // we don't want to always link with Winsock DLL as we might not use it at
@@ -1012,7 +1012,7 @@ wxString wxGetOsDescription()
 #endif // Win32/16
 }
 
-wxToolkitInfo *wxAppTraits::GetToolkitInfo()
+wxToolkitInfo& wxAppTraits::GetToolkitInfo()
 {
     // cache the version info, it's not going to change
     //
@@ -1061,7 +1061,7 @@ wxToolkitInfo *wxAppTraits::GetToolkitInfo()
     info.versionMinor = s_minor;
     info.os = s_ver;
     info.name = _T("wxBase");
-    return &info;
+    return info;
 }
 
 // ----------------------------------------------------------------------------