From b5d09a5fb85c1d24e9282734f786495114c1fa53 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sat, 21 Jan 2006 01:34:42 +0000 Subject: [PATCH] Remove wxGetOsDescription from MGL's utils, and add it to msdos's git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mgl/utils.cpp | 21 --------------------- src/msdos/utilsdos.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp index 563089b2f5..fd2e5c63c7 100644 --- a/src/mgl/utils.cpp +++ b/src/mgl/utils.cpp @@ -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() diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp index f0a227f696..c8b1151512 100644 --- a/src/msdos/utilsdos.cpp +++ b/src/msdos/utilsdos.cpp @@ -477,3 +477,13 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() info.os = wxDOS; return info; } + +//---------------------------------------------------------------------------- +// OS Description +//---------------------------------------------------------------------------- + +wxString wxGetOsDescription() +{ + wxString osname(_T("DOS")); + return osname; +} -- 2.47.2