]> git.saurik.com Git - wxWidgets.git/commitdiff
Remove wxGetOsDescription from MGL's utils, and add it to msdos's
authorMichael Wetherell <mike.wetherell@ntlworld.com>
Sat, 21 Jan 2006 01:34:42 +0000 (01:34 +0000)
committerMichael Wetherell <mike.wetherell@ntlworld.com>
Sat, 21 Jan 2006 01:34:42 +0000 (01:34 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mgl/utils.cpp
src/msdos/utilsdos.cpp

index 563089b2f591a6a329759bb26a6bcf55efd16f95..fd2e5c63c73e0c0417e432908cffb3bd905a6c1e 100644 (file)
@@ -90,27 +90,6 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
-wxString wxGetOsDescription()
-{
-    wxString osname(
-
-#if defined(__UNIX__)
-        _T("Unix")
-#elif defined(__OS2__)
-        _T("OS/2")
-#elif defined(__WIN32__)
-        _T("Windows")
-#elif defined(__DOS__)
-        _T("DOS")
-#else
-        _T("unknown")
-#endif
-
-    );
-
-    return osname;
-}
-
 #if wxUSE_GUI
 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
index f0a227f696f911808a816fd9fcb7a56402e99d2c..c8b1151512820291ff3d85d2526d572077ed3ca0 100644 (file)
@@ -477,3 +477,13 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
     info.os = wxDOS;
     return info;
 }
+
+//----------------------------------------------------------------------------
+// OS Description
+//----------------------------------------------------------------------------
+
+wxString wxGetOsDescription()
+{
+    wxString osname(_T("DOS"));
+    return osname;
+}