X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50567b69d60faa5a3575a077bb4f98530813c80d..9f39393d9efe16244c8d213076582dfd996cb129:/src/msw/utils.cpp?ds=sidebyside diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index f5efb921f0..f9db6a472b 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -41,7 +41,7 @@ // #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__)) +#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__)) extern "C" { #include // we use socket functions in wxGetFullHostName() } @@ -51,9 +51,7 @@ extern "C" { #include "wx/timer.h" -#include - -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) +#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) #include #ifndef __MWERKS__ @@ -82,7 +80,7 @@ extern "C" { #include #endif // USE_NET_API -#if defined(__WIN32__) && !defined(__WXWINE__) +#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) #include #ifndef __GNUWIN32__ @@ -90,15 +88,11 @@ extern "C" { #endif #endif -#include -#include -#include #ifndef __WATCOMC__ #if !(defined(_MSC_VER) && (_MSC_VER > 800)) #include #endif #endif -#include //// BEGIN for console support: VC++ only #ifdef __VISUALC__ @@ -109,13 +103,7 @@ extern "C" { #include "wx/ioswrap.h" -#if wxUSE_IOSTREAMH -// N.B. BC++ doesn't have istream.h, ostream.h -# include -# include -#else -# include -#endif +#include "wx/ioswrap.h" /* Need to undef new if including crtdbg.h */ # ifdef new @@ -143,11 +131,13 @@ static const wxChar WX_SECTION[] = wxT("wxWindows"); static const wxChar eUSERNAME[] = wxT("UserName"); // these are only used under Win16 -#ifndef __WIN32__ +#if !defined(__WIN32__) && !defined(__WXMICROWIN__) static const wxChar eHOSTNAME[] = wxT("HostName"); static const wxChar eUSERID[] = wxT("UserId"); #endif // !Win32 +#ifndef __WXMICROWIN__ + // ============================================================================ // implementation // ============================================================================ @@ -159,7 +149,7 @@ static const wxChar eUSERID[] = wxT("UserId"); // Get hostname only (without domain name) bool wxGetHostName(wxChar *buf, int maxSize) { -#if defined(__WIN32__) && !defined(__TWIN32__) +#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) DWORD nSize = maxSize; if ( !::GetComputerName(buf, &nSize) ) { @@ -185,7 +175,7 @@ bool wxGetHostName(wxChar *buf, int maxSize) // get full hostname (with domain name if possible) bool wxGetFullHostName(wxChar *buf, int maxSize) { -#if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__)) +#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__)) // TODO should use GetComputerNameEx() when available WSADATA wsa; if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 ) @@ -230,7 +220,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) // Get user ID e.g. jacs bool wxGetUserId(wxChar *buf, int maxSize) { -#if defined(__WIN32__) && !defined(__win32s__) && !defined(__TWIN32__) +#if defined(__WIN32__) && !defined(__win32s__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) DWORD nSize = maxSize; if ( ::GetUserName(buf, &nSize) == 0 ) { @@ -435,7 +425,9 @@ wxChar *wxGetUserHome(const wxString& WXUNUSED(user)) bool wxDirExists(const wxString& dir) { -#if defined(__WIN32__) +#ifdef __WXMICROWIN__ + return wxPathExist(dir); +#elif defined(__WIN32__) DWORD attribs = GetFileAttributes(dir); return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY)); #else // Win16 @@ -862,10 +854,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) #if wxUSE_GUI +#if wxUSE_TIMER + // Sleep for nSecs seconds. Attempt a Windows implementation using timers. static bool gs_inTimer = FALSE; -class wxSleepTimer: public wxTimer +class wxSleepTimer : public wxTimer { public: virtual void Notify() @@ -881,7 +875,7 @@ void wxUsleep(unsigned long milliseconds) { #ifdef __WIN32__ ::Sleep(milliseconds); -#else +#else // !Win32 if (gs_inTimer) return; @@ -895,7 +889,7 @@ void wxUsleep(unsigned long milliseconds) } delete wxTheSleepTimer; wxTheSleepTimer = NULL; -#endif +#endif // Win32/!Win32 } void wxSleep(int nSecs) @@ -921,6 +915,8 @@ void wxFlushEvents() // wxYield(); } +#endif // wxUSE_TIMER + #elif defined(__WIN32__) // wxUSE_GUI void wxUsleep(unsigned long milliseconds) @@ -934,6 +930,8 @@ void wxSleep(int nSecs) } #endif // wxUSE_GUI/!wxUSE_GUI +#endif + // __WXMICROWIN__ // ---------------------------------------------------------------------------- // deprecated (in favour of wxLog) log functions @@ -942,6 +940,7 @@ void wxSleep(int nSecs) #if wxUSE_GUI // Output a debug mess., in a system dependent fashion. +#ifndef __WXMICROWIN__ void wxDebugMsg(const wxChar *fmt ...) { va_list ap; @@ -973,6 +972,7 @@ void wxFatalError(const wxString& msg, const wxString& title) wxSprintf(wxBuffer, wxT("%s: %s"), WXSTRINGCAST title, WXSTRINGCAST msg); FatalAppExit(0, (LPCTSTR)wxBuffer); } +#endif // __WXMICROWIN__ // ---------------------------------------------------------------------------- // functions to work with .INI files @@ -1099,7 +1099,9 @@ void wxBeginBusyCursor(wxCursor *cursor) if ( gs_wxBusyCursorCount++ == 0 ) { gs_wxBusyCursor = (HCURSOR)cursor->GetHCURSOR(); +#ifndef __WXMICROWIN__ gs_wxBusyCursorOld = ::SetCursor(gs_wxBusyCursor); +#endif } //else: nothing to do, already set } @@ -1112,8 +1114,9 @@ void wxEndBusyCursor() if ( --gs_wxBusyCursorCount == 0 ) { +#ifndef __WXMICROWIN__ ::SetCursor(gs_wxBusyCursorOld); - +#endif gs_wxBusyCursorOld = 0; } } @@ -1143,6 +1146,7 @@ bool wxCheckForInterrupt(wxWindow *wnd) // MSW only: get user-defined resource from the .res file. // Returns NULL or newly-allocated memory, so use delete[] to clean up. +#ifndef __WXMICROWIN__ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType) { HRSRC hResource = ::FindResource(wxGetInstance(), resourceName, resourceType); @@ -1176,6 +1180,7 @@ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourc return s; } +#endif // ---------------------------------------------------------------------------- // get display info @@ -1194,6 +1199,10 @@ void wxGetMousePosition( int* x, int* y ) // Return TRUE if we have a colour display bool wxColourDisplay() { +#ifdef __WXMICROWIN__ + // MICROWIN_TODO + return TRUE; +#else // this function is called from wxDC ctor so it is called a *lot* of times // hence we optimize it a bit but doign the check only once // @@ -1210,6 +1219,7 @@ bool wxColourDisplay() } return s_isColour != 0; +#endif } // Returns depth of screen @@ -1222,23 +1232,37 @@ int wxDisplayDepth() // Get size of display void wxDisplaySize(int *width, int *height) { +#ifdef __WXMICROWIN__ + RECT rect; + HWND hWnd = GetDesktopWindow(); + ::GetWindowRect(hWnd, & rect); + + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; +#else ScreenHDC dc; if ( width ) *width = GetDeviceCaps(dc, HORZRES); if ( height ) *height = GetDeviceCaps(dc, VERTRES); +#endif } void wxDisplaySizeMM(int *width, int *height) { +#ifdef __WXMICROWIN__ + // MICROWIN_TODO + *width = 0; * height = 0; +#else ScreenHDC dc; if ( width ) *width = GetDeviceCaps(dc, HORZSIZE); if ( height ) *height = GetDeviceCaps(dc, VERTSIZE); +#endif } void wxClientDisplayRect(int *x, int *y, int *width, int *height) { -#ifdef __WIN16__ +#if defined(__WIN16__) || defined(__WXMICROWIN__) *x = 0; *y = 0; wxDisplaySize(width, height); #else @@ -1271,6 +1295,10 @@ wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd) wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd) { +#ifdef __WXMICROWIN__ + // MICROWIN_TODO + return wxEmptyString; +#else wxString str; int len = 256; // some starting value @@ -1310,6 +1338,7 @@ wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd) } return str; +#endif } WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd) @@ -1584,4 +1613,13 @@ void wxRedirectIOToConsole() } #endif +#ifdef __WXMICROWIN__ +int wxGetOsVersion(int *majorVsn, int *minorVsn) +{ + // MICROWIN_TODO + if (majorVsn) *majorVsn = 0; + if (minorVsn) *minorVsn = 0; + return wxUNIX; +} +#endif