X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/807a903e6807ae3e49928bda488a04bc0d832149..7699e843c07be6b26d65e9efbbb5e9d32f74d294:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index b7a6ae1a48..47693a30a3 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -38,7 +38,7 @@ // In some mingws there is a missing extern "C" int the winsock header, // so we put it here just to be safe. Note that this must appear _before_ -// #include "wx/msw/private.h" which itself includes , as this +// #include "wx/msw/private.h" which itself includes , as this // one in turn includes unless we define WIN32_LEAN_AND_MEAN. // #if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__)) @@ -437,7 +437,7 @@ bool wxDirExists(const wxString& dir) { #if defined(__WIN32__) DWORD attribs = GetFileAttributes(dir); - return ((attribs != -1) && (attribs & FILE_ATTRIBUTE_DIRECTORY)); + return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY)); #else // Win16 #ifdef __BORLANDC__ struct ffblk fileInfo; @@ -617,7 +617,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) *majorVsn = info.dwMajorVersion; if (minorVsn) *minorVsn = info.dwMinorVersion; - + switch ( info.dwPlatformId ) { case VER_PLATFORM_WIN32s: @@ -1032,6 +1032,18 @@ void wxDisplaySizeMM(int *width, int *height) if ( height ) *height = GetDeviceCaps(dc, VERTSIZE); } +void wxClientDisplayRect(int *x, int *y, int *width, int *height) +{ + // Determine the desktop dimensions minus the taskbar and any other + // special decorations... + RECT r; + SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); + if (x) *x = r.left; + if (y) *y = r.top; + if (width) *width = r.right - r.left; + if (height) *height = r.bottom - r.top; +} + // --------------------------------------------------------------------------- // window information functions