X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b169661f86298d780e166dccea3bbe0dd097f67b..238a604422eed8dae5d9263f6fe71731813371b1:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 36ae618228..5e295b5a8e 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -32,6 +32,7 @@ #endif //WX_PRECOMP #include "wx/apptrait.h" +#include "wx/dynlib.h" #include "wx/dynload.h" #include "wx/confbase.h" // for wxExpandEnvVars() @@ -39,8 +40,14 @@ #include "wx/msw/private.h" // includes #include "wx/msw/missing.h" // CHARSET_HANGUL -#if defined(__GNUWIN32_OLD__) || defined(__WXWINCE__) \ - || defined(__CYGWIN32__) +#if defined(__CYGWIN__) + //CYGWIN gives annoying warning about runtime stuff if we don't do this +# define USE_SYS_TYPES_FD_SET +# include +#endif + +// Doesn't work with Cygwin at present +#if wxUSE_SOCKETS && (defined(__GNUWIN32_OLD__) || defined(__WXWINCE__) || defined(__CYGWIN32__)) // apparently we need to include winsock.h to get WSADATA and other stuff // used in wxGetFullHostName() with the old mingw32 versions #include @@ -117,6 +124,9 @@ static const wxChar eUSERNAME[] = wxT("UserName"); bool wxGetHostName(wxChar *buf, int maxSize) { #if defined(__WXWINCE__) + // TODO-CE + wxUnusedVar(buf); + wxUnusedVar(maxSize); return false; #elif defined(__WIN32__) && !defined(__WXMICROWIN__) DWORD nSize = maxSize; @@ -144,7 +154,7 @@ bool wxGetHostName(wxChar *buf, int maxSize) // get full hostname (with domain name if possible) bool wxGetFullHostName(wxChar *buf, int maxSize) { -#if !defined( __WXMICROWIN__) && wxUSE_DYNAMIC_LOADER +#if !defined( __WXMICROWIN__) && wxUSE_DYNAMIC_LOADER && wxUSE_SOCKETS // TODO should use GetComputerNameEx() when available // we don't want to always link with Winsock DLL as we might not use it at @@ -229,6 +239,9 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) bool wxGetUserId(wxChar *buf, int maxSize) { #if defined(__WXWINCE__) + // TODO-CE + wxUnusedVar(buf); + wxUnusedVar(maxSize); return false; #elif defined(__WIN32__) && !defined(__WXMICROWIN__) DWORD nSize = maxSize; @@ -269,6 +282,9 @@ bool wxGetUserId(wxChar *buf, int maxSize) bool wxGetUserName(wxChar *buf, int maxSize) { #if defined(__WXWINCE__) + // TODO-CE + wxUnusedVar(buf); + wxUnusedVar(maxSize); return false; #elif defined(USE_NET_API) CHAR szUserName[256]; @@ -349,9 +365,9 @@ error: { wxStrncpy(buf, wxT("Unknown User"), maxSize); } -#endif // Win32/16 return true; +#endif // Win32/16 } const wxChar* wxGetHomeDir(wxString *pstr) @@ -380,7 +396,7 @@ const wxChar* wxGetHomeDir(wxString *pstr) strDir = windowsPath; #endif #elif defined(__WXWINCE__) - // Nothing + strDir = wxT("\\"); #else strDir.clear(); @@ -450,19 +466,13 @@ wxChar *wxGetUserHome(const wxString& WXUNUSED(user)) return (wxChar *)wxGetHomeDir(&s_home); } -bool wxDirExists(const wxString& dir) -{ -#ifdef __WXMICROWIN__ - return wxPathExist(dir); -#elif defined(__WIN32__) - DWORD attribs = GetFileAttributes(dir); - return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY)); -#endif // Win32/__WXMICROWIN__ -} - bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { #ifdef __WXWINCE__ + // TODO-CE + wxUnusedVar(path); + wxUnusedVar(pTotal); + wxUnusedVar(pFree); return false; #else if ( path.empty() ) @@ -575,6 +585,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) bool wxGetEnv(const wxString& var, wxString *value) { #ifdef __WXWINCE__ + // no environment variables under CE + wxUnusedVar(var); + wxUnusedVar(value); return false; #else // Win32 // first get the size of the buffer @@ -609,6 +622,9 @@ bool wxSetEnv(const wxString& var, const wxChar *value) return true; #else // no way to set env vars + // no environment variables under CE + wxUnusedVar(var); + wxUnusedVar(value); return false; #endif } @@ -894,7 +910,8 @@ int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc) } //Fill in the size of the structure before using it. - PROCESSENTRY32 pe = {0}; + PROCESSENTRY32 pe; + wxZeroMemory(pe); pe.dwSize = sizeof(PROCESSENTRY32); // Walk the snapshot of the processes, and for each process, @@ -949,6 +966,8 @@ bool wxShell(const wxString& command) bool wxShutdown(wxShutdownFlags wFlags) { #ifdef __WXWINCE__ + // TODO-CE + wxUnusedVar(wFlags); return false; #elif defined(__WIN32__) bool bOK = true; @@ -1005,6 +1024,18 @@ bool wxShutdown(wxShutdownFlags wFlags) #endif // Win32/16 } +wxPowerType wxGetPowerType() +{ + // TODO + return wxPOWER_UNKNOWN; +} + +wxBatteryState wxGetBatteryState() +{ + // TODO + return wxBATTERY_UNKNOWN_STATE; +} + // ---------------------------------------------------------------------------- // misc // ---------------------------------------------------------------------------- @@ -1036,6 +1067,25 @@ void wxBell() ::MessageBeep((UINT)-1); // default sound } +bool wxIsDebuggerRunning() +{ + // IsDebuggerPresent() is not available under Win95, so load it dynamically + wxDynamicLibrary dll(_T("kernel32.dll"), wxDL_VERBATIM); + + typedef BOOL (WINAPI *IsDebuggerPresent_t)(); + if ( !dll.HasSymbol(_T("IsDebuggerPresent")) ) + { + // no way to know, assume no + return false; + } + + return (*(IsDebuggerPresent_t)dll.GetSymbol(_T("IsDebuggerPresent")))() != 0; +} + +// ---------------------------------------------------------------------------- +// OS version +// ---------------------------------------------------------------------------- + wxString wxGetOsDescription() { wxString str; @@ -1156,6 +1206,11 @@ wxToolkitInfo& wxAppTraits::GetToolkitInfo() s_major = info.dwMajorVersion; s_minor = info.dwMinorVersion; +#ifdef __SMARTPHONE__ + s_ver = wxWINDOWS_SMARTPHONE; +#elif defined(__POCKETPC__) + s_ver = wxWINDOWS_POCKETPC; +#else switch ( info.dwPlatformId ) { case VER_PLATFORM_WIN32s: @@ -1172,9 +1227,9 @@ wxToolkitInfo& wxAppTraits::GetToolkitInfo() #ifdef __WXWINCE__ case VER_PLATFORM_WIN32_CE: s_ver = wxWINDOWS_CE; - break; #endif } +#endif } } @@ -1285,64 +1340,74 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding) // There don't seem to be symbolic names for // these under Windows so I just copied the // values from MSDN. + + unsigned int ret; + switch (encoding) { - case wxFONTENCODING_ISO8859_1: return 28591; - case wxFONTENCODING_ISO8859_2: return 28592; - case wxFONTENCODING_ISO8859_3: return 28593; - case wxFONTENCODING_ISO8859_4: return 28594; - case wxFONTENCODING_ISO8859_5: return 28595; - case wxFONTENCODING_ISO8859_6: return 28596; - case wxFONTENCODING_ISO8859_7: return 28597; - case wxFONTENCODING_ISO8859_8: return 28598; - case wxFONTENCODING_ISO8859_9: return 28599; - // case wxFONTENCODING_ISO8859_10: - case wxFONTENCODING_ISO8859_11: return 874; // Thai? + case wxFONTENCODING_ISO8859_1: ret = 28591; break; + case wxFONTENCODING_ISO8859_2: ret = 28592; break; + case wxFONTENCODING_ISO8859_3: ret = 28593; break; + case wxFONTENCODING_ISO8859_4: ret = 28594; break; + case wxFONTENCODING_ISO8859_5: ret = 28595; break; + case wxFONTENCODING_ISO8859_6: ret = 28596; break; + case wxFONTENCODING_ISO8859_7: ret = 28597; break; + case wxFONTENCODING_ISO8859_8: ret = 28598; break; + case wxFONTENCODING_ISO8859_9: ret = 28599; break; + case wxFONTENCODING_ISO8859_10: ret = 28600; break; + case wxFONTENCODING_ISO8859_11: ret = 28601; break; // case wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it - // case wxFONTENCODING_ISO8859_13, // Baltic (Latin7) - // case wxFONTENCODING_ISO8859_14, // Latin8 - case wxFONTENCODING_ISO8859_15: return 28605; - case wxFONTENCODING_KOI8: return 20866; - case wxFONTENCODING_KOI8_U: return 21866; - case wxFONTENCODING_CP437: return 437; - case wxFONTENCODING_CP850: return 850; - case wxFONTENCODING_CP852: return 852; - case wxFONTENCODING_CP855: return 855; - case wxFONTENCODING_CP866: return 866; - case wxFONTENCODING_CP874: return 874; - case wxFONTENCODING_CP932: return 932; - case wxFONTENCODING_CP936: return 936; - case wxFONTENCODING_CP949: return 949; - case wxFONTENCODING_CP950: return 950; - case wxFONTENCODING_CP1250: return 1250; - case wxFONTENCODING_CP1251: return 1251; - case wxFONTENCODING_CP1252: return 1252; - case wxFONTENCODING_CP1253: return 1253; - case wxFONTENCODING_CP1254: return 1254; - case wxFONTENCODING_CP1255: return 1255; - case wxFONTENCODING_CP1256: return 1256; - case wxFONTENCODING_CP1257: return 1257; - case wxFONTENCODING_EUC_JP: return 51932; - case wxFONTENCODING_MACROMAN: return 10000; - case wxFONTENCODING_MACJAPANESE: return 10001; - case wxFONTENCODING_MACCHINESETRAD: return 10002; - case wxFONTENCODING_MACKOREAN: return 10003; - case wxFONTENCODING_MACARABIC: return 10004; - case wxFONTENCODING_MACHEBREW: return 10005; - case wxFONTENCODING_MACGREEK: return 10006; - case wxFONTENCODING_MACCYRILLIC: return 10007; - case wxFONTENCODING_MACTHAI: return 10021; - case wxFONTENCODING_MACCHINESESIMP: return 10008; - case wxFONTENCODING_MACCENTRALEUR: return 10029; - case wxFONTENCODING_MACCROATIAN: return 10082; - case wxFONTENCODING_MACICELANDIC: return 10079; - case wxFONTENCODING_MACROMANIAN: return 10009; - case wxFONTENCODING_UTF7: return 65000; - case wxFONTENCODING_UTF8: return 65001; - default: return -1; + case wxFONTENCODING_ISO8859_13: ret = 28603; break; + case wxFONTENCODING_ISO8859_14: ret = 28604; break; + case wxFONTENCODING_ISO8859_15: ret = 28605; break; + case wxFONTENCODING_KOI8: ret = 20866; break; + case wxFONTENCODING_KOI8_U: ret = 21866; break; + case wxFONTENCODING_CP437: ret = 437; break; + case wxFONTENCODING_CP850: ret = 850; break; + case wxFONTENCODING_CP852: ret = 852; break; + case wxFONTENCODING_CP855: ret = 855; break; + case wxFONTENCODING_CP866: ret = 866; break; + case wxFONTENCODING_CP874: ret = 874; break; + case wxFONTENCODING_CP932: ret = 932; break; + case wxFONTENCODING_CP936: ret = 936; break; + case wxFONTENCODING_CP949: ret = 949; break; + case wxFONTENCODING_CP950: ret = 950; break; + case wxFONTENCODING_CP1250: ret = 1250; break; + case wxFONTENCODING_CP1251: ret = 1251; break; + case wxFONTENCODING_CP1252: ret = 1252; break; + case wxFONTENCODING_CP1253: ret = 1253; break; + case wxFONTENCODING_CP1254: ret = 1254; break; + case wxFONTENCODING_CP1255: ret = 1255; break; + case wxFONTENCODING_CP1256: ret = 1256; break; + case wxFONTENCODING_CP1257: ret = 1257; break; + case wxFONTENCODING_EUC_JP: ret = 51932; break; + case wxFONTENCODING_MACROMAN: ret = 10000; break; + case wxFONTENCODING_MACJAPANESE: ret = 10001; break; + case wxFONTENCODING_MACCHINESETRAD: ret = 10002; break; + case wxFONTENCODING_MACKOREAN: ret = 10003; break; + case wxFONTENCODING_MACARABIC: ret = 10004; break; + case wxFONTENCODING_MACHEBREW: ret = 10005; break; + case wxFONTENCODING_MACGREEK: ret = 10006; break; + case wxFONTENCODING_MACCYRILLIC: ret = 10007; break; + case wxFONTENCODING_MACTHAI: ret = 10021; break; + case wxFONTENCODING_MACCHINESESIMP: ret = 10008; break; + case wxFONTENCODING_MACCENTRALEUR: ret = 10029; break; + case wxFONTENCODING_MACCROATIAN: ret = 10082; break; + case wxFONTENCODING_MACICELANDIC: ret = 10079; break; + case wxFONTENCODING_MACROMANIAN: ret = 10009; break; + case wxFONTENCODING_UTF7: ret = 65000; break; + case wxFONTENCODING_UTF8: ret = 65001; break; + default: return -1; } - return -1; + if (::IsValidCodePage(ret) == 0) + return -1; + + CPINFO info; + if (::GetCPInfo(ret, &info) == 0) + return -1; + + return (long) ret; } extern long wxCharsetToCodepage(const wxChar *name) @@ -1351,7 +1416,7 @@ extern long wxCharsetToCodepage(const wxChar *name) if ( !name ) return -1; - wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(name, false); + wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false); if ( enc == wxFONTENCODING_SYSTEM ) return -1;