Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missing wxGetOsDescription() for wxMGL in response to undefined reference in wxLogs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-08-30 17:25:58 +00:00
parent 2cbdf975a9
commit 99f0cdf2e9
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mgl/utils.cpp
View File

@@ -60,11 +60,11 @@ void wxDisplaySizeMM(int *width, int *height)
wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") ); wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
int xDPI, yDPI; int xDPI, yDPI;
MGL_getDotsPerInch(&xDPI, &yDPI); MGL_getDotsPerInch(&xDPI, &yDPI);
if ( width ) if ( width )
*width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI); *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);
if ( height ) if ( height )
*height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI); *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI);
} }
@@ -79,7 +79,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
bool wxColourDisplay() bool wxColourDisplay()
{ {
wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") ); wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
return (wxDisplayDepth() > 1); return (wxDisplayDepth() > 1);
} }
@@ -90,6 +90,27 @@ int wxDisplayDepth()
return g_displayDC->getBitsPerPixel(); 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 #if wxUSE_GUI
wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()