/////////////////////////////////////////////////////////////////////////////
-// Name: msw/utils.cpp
+// Name: src/msw/utils.cpp
// Purpose: Various utilities
// Author: Julian Smart
// Modified by:
#include "wx/log.h"
#endif //WX_PRECOMP
+#include "wx/msw/registry.h"
#include "wx/apptrait.h"
+#include "wx/dynlib.h"
#include "wx/dynload.h"
+#include "wx/scopeguard.h"
#include "wx/confbase.h" // for wxExpandEnvVars()
#include "wx/msw/private.h" // includes <windows.h>
#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 <sys/types.h>
+#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 <winsock.h>
#endif
#endif
-// 260 was taken from windef.h
-#ifndef MAX_PATH
- #define MAX_PATH 260
-#endif
+// For wxKillAllChildren
+#include <tlhelp32.h>
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// In the WIN.INI file
+#if (!defined(USE_NET_API) && !defined(__WXWINCE__)) || defined(__WXMICROWIN__)
static const wxChar WX_SECTION[] = wxT("wxWindows");
+#endif
+
+#if (!defined(USE_NET_API) && !defined(__WXWINCE__))
static const wxChar eUSERNAME[] = wxT("UserName");
+#endif
// ============================================================================
// implementation
// ----------------------------------------------------------------------------
// Get hostname only (without domain name)
-bool wxGetHostName(wxChar *buf, int maxSize)
+bool wxGetHostName(wxChar *WXUNUSED_IN_WINCE(buf),
+ int WXUNUSED_IN_WINCE(maxSize))
{
#if defined(__WXWINCE__)
+ // TODO-CE
return false;
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
DWORD nSize = maxSize;
return false;
}
- return TRUE;
+ return true;
#else
wxChar *sysname;
const wxChar *default_host = wxT("noname");
} else
wxStrncpy(buf, sysname, maxSize - 1);
buf[maxSize] = wxT('\0');
- return *buf ? TRUE : FALSE;
+ return *buf ? true : false;
#endif
}
// 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
{
wxStrncpy(buf, host, maxSize);
- return TRUE;
+ return true;
}
}
}
}
// Get user ID e.g. jacs
-bool wxGetUserId(wxChar *buf, int maxSize)
+bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf),
+ int WXUNUSED_IN_WINCE(maxSize))
{
#if defined(__WXWINCE__)
+ // TODO-CE
return false;
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
DWORD nSize = maxSize;
if ( res == 0 )
{
// not found
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
#else // __WXMICROWIN__
wxChar *user;
const wxChar *default_id = wxT("anonymous");
// Can't assume we have NIS (PC-NFS) or some other ID daemon
// So we ...
- if ( (user = wxGetenv(wxT("USER"))) == NULL &&
- (user = wxGetenv(wxT("LOGNAME"))) == NULL )
+ if ( (user = wxGetenv(wxT("USER"))) == NULL &&
+ (user = wxGetenv(wxT("LOGNAME"))) == NULL )
{
// Use wxWidgets configuration data (comming soon)
GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
wxStrncpy(buf, user, maxSize - 1);
}
- return *buf ? TRUE : FALSE;
+ return *buf ? true : false;
#endif
}
// Get user name e.g. Julian Smart
bool wxGetUserName(wxChar *buf, int maxSize)
{
+ wxCHECK_MSG( buf && ( maxSize > 0 ), false,
+ _T("empty buffer in wxGetUserName") );
#if defined(__WXWINCE__)
- return false;
+ wxLogNull noLog;
+ wxRegKey key(wxRegKey::HKCU, wxT("ControlPanel\\Owner"));
+ if(!key.Open(wxRegKey::Read))
+ return false;
+ wxString name;
+ if(!key.QueryValue(wxT("Owner"),name))
+ return false;
+ wxStrncpy(buf, name.c_str(), maxSize-1);
+ buf[maxSize-1] = _T('\0');
+ return true;
#elif defined(USE_NET_API)
CHAR szUserName[256];
if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) )
WideCharToMultiByte( CP_ACP, 0, ui2->usri2_full_name, -1,
buf, maxSize, NULL, NULL );
- return TRUE;
+ return true;
error:
wxLogError(wxT("Couldn't look up full user name."));
- return FALSE;
+ return false;
#else // !USE_NET_API
// Could use NIS, MS-Mail or other site specific programs
// Use wxWidgets configuration data
{
wxStrncpy(buf, wxT("Unknown User"), maxSize);
}
-#endif // Win32/16
- return TRUE;
+ return true;
+#endif // Win32/16
}
const wxChar* wxGetHomeDir(wxString *pstr)
strDir = windowsPath;
#endif
#elif defined(__WXWINCE__)
- // Nothing
+ strDir = wxT("\\");
#else
strDir.clear();
}
else // fall back to the program directory
{
- wxString strPath;
- ::GetModuleFileName(::GetModuleHandle(NULL),
- wxStringBuffer(strPath, MAX_PATH), MAX_PATH);
-
- // extract the dir name
- wxSplitPath(strPath, &strDir, NULL, NULL);
+ // extract the directory component of the program file name
+ wxSplitPath(wxGetFullModuleName(), &strDir, NULL, NULL);
}
#endif // UNIX/Win
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)
+bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
+ wxDiskspaceSize_t *WXUNUSED_IN_WINCE(pTotal),
+ wxDiskspaceSize_t *WXUNUSED_IN_WINCE(pFree))
{
#ifdef __WXWINCE__
+ // TODO-CE
return false;
#else
if ( path.empty() )
{
wxLogLastError(_T("GetDiskFreeSpaceEx"));
- return FALSE;
+ return false;
}
// ULARGE_INTEGER is a union of a 64 bit value and a struct containing
#endif
if ( pTotal )
{
- *pTotal = wxLongLong(UL(bytesTotal).HighPart, UL(bytesTotal).LowPart);
+#if wxUSE_LONGLONG
+ *pTotal = wxDiskspaceSize_t(UL(bytesTotal).HighPart, UL(bytesTotal).LowPart);
+#else
+ *pTotal = wxDiskspaceSize_t(UL(bytesTotal).LowPart);
+#endif
}
if ( pFree )
{
+#if wxUSE_LONGLONG
*pFree = wxLongLong(UL(bytesFree).HighPart, UL(bytesFree).LowPart);
+#else
+ *pFree = wxDiskspaceSize_t(UL(bytesFree).LowPart);
+#endif
}
}
else
{
wxLogLastError(_T("GetDiskFreeSpace"));
- return FALSE;
+ return false;
}
- wxLongLong lBytesPerCluster = lSectorsPerCluster;
+ wxDiskspaceSize_t lBytesPerCluster = (wxDiskspaceSize_t) lSectorsPerCluster;
lBytesPerCluster *= lBytesPerSector;
if ( pTotal )
}
}
- return TRUE;
+ return true;
#endif
// __WXWINCE__
}
// env vars
// ----------------------------------------------------------------------------
-bool wxGetEnv(const wxString& var, wxString *value)
+bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var),
+ wxString *WXUNUSED_IN_WINCE(value))
{
#ifdef __WXWINCE__
- return FALSE;
+ // no environment variables under CE
+ return false;
#else // Win32
// first get the size of the buffer
DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
if ( !dwRet )
{
// this means that there is no such variable
- return FALSE;
+ return false;
}
if ( value )
dwRet);
}
- return TRUE;
+ return true;
#endif // WinCE/32
}
-bool wxSetEnv(const wxString& var, const wxChar *value)
+bool wxSetEnv(const wxString& WXUNUSED_IN_WINCE(var),
+ const wxChar *WXUNUSED_IN_WINCE(value))
{
// some compilers have putenv() or _putenv() or _wputenv() but it's better
// to always use Win32 function directly instead of dealing with them
-#if defined(__WIN32__) && !defined(__WXWINCE__)
+#ifdef __WXWINCE__
+ // no environment variables under CE
+ return false;
+#else
if ( !::SetEnvironmentVariable(var, value) )
{
wxLogLastError(_T("SetEnvironmentVariable"));
- return FALSE;
+ return false;
}
- return TRUE;
-#else // no way to set env vars
- return FALSE;
+ return true;
#endif
}
return TRUE;
}
-int wxKill(long pid, wxSignal sig, wxKillError *krc)
+int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc);
+
+int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
{
+ if (flags & wxKILL_CHILDREN)
+ wxKillAllChildren(pid, sig, krc);
+
// get the process handle to operate on
HANDLE hProcess = ::OpenProcess(SYNCHRONIZE |
PROCESS_TERMINATE |
{
if ( krc )
{
- if ( ::GetLastError() == ERROR_ACCESS_DENIED )
- {
- *krc = wxKILL_ACCESS_DENIED;
- }
- else
- {
- *krc = wxKILL_NO_PROCESS;
- }
+ // recognize wxKILL_ACCESS_DENIED as special because this doesn't
+ // mean that the process doesn't exist and this is important for
+ // wxProcess::Exists()
+ *krc = ::GetLastError() == ERROR_ACCESS_DENIED
+ ? wxKILL_ACCESS_DENIED
+ : wxKILL_NO_PROCESS;
}
return -1;
}
- bool ok = TRUE;
+ wxON_BLOCK_EXIT1(::CloseHandle, hProcess);
+
+ bool ok = true;
switch ( sig )
{
case wxSIGKILL:
*krc = wxKILL_ERROR;
}
- ok = FALSE;
+ ok = false;
}
break;
case wxSIGNONE:
// do nothing, we just want to test for process existence
- break;
+ if ( krc )
+ *krc = wxKILL_OK;
+ return 0;
default:
// any other signal means "terminate"
params.pid = (DWORD)pid;
// EnumWindows() has nice semantics: it returns 0 if it found
- // something or if an error occured and non zero if it
+ // something or if an error occurred and non zero if it
// enumerated all the window
if ( !::EnumWindows(wxEnumFindByPidProc, (LPARAM)¶ms) )
{
{
// tell the app to close
//
- // NB: this is the harshest way, the app won't have
+ // NB: this is the harshest way, the app won't have an
// opportunity to save any files, for example, but
// this is probably what we want here. If not we
// can also use SendMesageTimeout(WM_CLOSE)
{
wxLogLastError(_T("EnumWindows"));
- ok = FALSE;
+ ok = false;
}
}
else // no windows for this PID
{
if ( krc )
- {
*krc = wxKILL_ERROR;
- }
- ok = FALSE;
+ ok = false;
}
}
}
// the return code
- DWORD rc;
-
+ DWORD rc wxDUMMY_INITIALIZE(0);
if ( ok )
{
// as we wait for a short time, we can use just WaitForSingleObject()
case WAIT_TIMEOUT:
if ( krc )
- {
*krc = wxKILL_ERROR;
- }
rc = STILL_ACTIVE;
break;
}
}
- else // !ok
- {
- // just to suppress the warnings about uninitialized variable
- rc = 0;
- }
- ::CloseHandle(hProcess);
// the return code is the same as from Unix kill(): 0 if killed
// successfully or -1 on error
- //
- // be careful to interpret rc correctly: for wxSIGNONE we return success if
- // the process exists, for all the other sig values -- if it doesn't
- if ( ok &&
- ((sig == wxSIGNONE) == (rc == STILL_ACTIVE)) )
- {
- if ( krc )
- {
- *krc = wxKILL_OK;
- }
+ if ( !ok || rc == STILL_ACTIVE )
+ return -1;
+ if ( krc )
+ *krc = wxKILL_OK;
+
+ return 0;
+}
+
+typedef HANDLE (WINAPI *CreateToolhelp32Snapshot_t)(DWORD,DWORD);
+typedef BOOL (WINAPI *Process32_t)(HANDLE,LPPROCESSENTRY32);
+
+CreateToolhelp32Snapshot_t lpfCreateToolhelp32Snapshot;
+Process32_t lpfProcess32First, lpfProcess32Next;
+
+static void InitToolHelp32()
+{
+ static bool s_initToolHelpDone = false;
+
+ if (s_initToolHelpDone)
+ return;
+
+ s_initToolHelpDone = true;
+
+ lpfCreateToolhelp32Snapshot = NULL;
+ lpfProcess32First = NULL;
+ lpfProcess32Next = NULL;
+
+#if wxUSE_DYNLIB_CLASS
+
+ wxDynamicLibrary dllKernel(_T("kernel32.dll"), wxDL_VERBATIM);
+
+ // Get procedure addresses.
+ // We are linking to these functions of Kernel32
+ // explicitly, because otherwise a module using
+ // this code would fail to load under Windows NT,
+ // which does not have the Toolhelp32
+ // functions in the Kernel 32.
+ lpfCreateToolhelp32Snapshot =
+ (CreateToolhelp32Snapshot_t)dllKernel.RawGetSymbol(_T("CreateToolhelp32Snapshot"));
+
+ lpfProcess32First =
+ (Process32_t)dllKernel.RawGetSymbol(_T("Process32First"));
+
+ lpfProcess32Next =
+ (Process32_t)dllKernel.RawGetSymbol(_T("Process32Next"));
+
+#endif // wxUSE_DYNLIB_CLASS
+}
+
+// By John Skiff
+int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc)
+{
+ InitToolHelp32();
+
+ if (krc)
+ *krc = wxKILL_OK;
+
+ // If not implemented for this platform (e.g. NT 4.0), silently ignore
+ if (!lpfCreateToolhelp32Snapshot || !lpfProcess32First || !lpfProcess32Next)
return 0;
+
+ // Take a snapshot of all processes in the system.
+ HANDLE hProcessSnap = lpfCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ if (hProcessSnap == INVALID_HANDLE_VALUE) {
+ if (krc)
+ *krc = wxKILL_ERROR;
+ return -1;
}
- // error
- return -1;
+ //Fill in the size of the structure before using it.
+ PROCESSENTRY32 pe;
+ wxZeroMemory(pe);
+ pe.dwSize = sizeof(PROCESSENTRY32);
+
+ // Walk the snapshot of the processes, and for each process,
+ // kill it if its parent is pid.
+ if (!lpfProcess32First(hProcessSnap, &pe)) {
+ // Can't get first process.
+ if (krc)
+ *krc = wxKILL_ERROR;
+ CloseHandle (hProcessSnap);
+ return -1;
+ }
+
+ do {
+ if (pe.th32ParentProcessID == (DWORD) pid) {
+ if (wxKill(pe.th32ProcessID, sig, krc))
+ return -1;
+ }
+ } while (lpfProcess32Next (hProcessSnap, &pe));
+
+
+ return 0;
}
// Execute a program in an Interactive Shell
}
// Shutdown or reboot the PC
-bool wxShutdown(wxShutdownFlags wFlags)
+bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags))
{
#ifdef __WXWINCE__
- return FALSE;
+ // TODO-CE
+ return false;
#elif defined(__WIN32__)
- bool bOK = TRUE;
+ bool bOK = true;
if ( wxGetOsVersion(NULL, NULL) == wxWINDOWS_NT ) // if is NT or 2K
{
default:
wxFAIL_MSG( _T("unknown wxShutdown() flag") );
- return FALSE;
+ return false;
}
bOK = ::ExitWindowsEx(flags, 0) != 0;
#endif // Win32/16
}
+wxPowerType wxGetPowerType()
+{
+ // TODO
+ return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+ // TODO
+ return wxBATTERY_UNKNOWN_STATE;
+}
+
// ----------------------------------------------------------------------------
// misc
// ----------------------------------------------------------------------------
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
{
-#if defined(__WIN32__) && !defined(__BORLANDC__)
+#if defined(__WIN64__)
+ MEMORYSTATUSEX memStatex;
+ memStatex.dwLength = sizeof (memStatex);
+ ::GlobalMemoryStatusEx (&memStatex);
+ return (wxMemorySize)memStatex.ullAvailPhys;
+#else /* if defined(__WIN32__) */
MEMORYSTATUS memStatus;
memStatus.dwLength = sizeof(MEMORYSTATUS);
- GlobalMemoryStatus(&memStatus);
- return memStatus.dwAvailPhys;
-#else
- return (long)GetFreeSpace(0);
+ ::GlobalMemoryStatus(&memStatus);
+ return (wxMemorySize)memStatus.dwAvailPhys;
#endif
}
::MessageBeep((UINT)-1); // default sound
}
+bool wxIsDebuggerRunning()
+{
+#if wxUSE_DYNLIB_CLASS
+ // 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;
+#else
+ return false;
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// OS version
+// ----------------------------------------------------------------------------
+
wxString wxGetOsDescription()
{
wxString str;
break;
case VER_PLATFORM_WIN32_WINDOWS:
- str.Printf(_("Windows 9%c"),
- info.dwMinorVersion == 0 ? _T('5') : _T('8'));
+ switch (info.dwMinorVersion)
+ {
+ case 0:
+ if ( info.szCSDVersion[1] == 'B' ||
+ info.szCSDVersion[1] == 'C' )
+ {
+ str = _("Windows 95 OSR2");
+ }
+ else
+ {
+ str = _("Windows 95");
+ }
+ break;
+ case 10:
+ if ( info.szCSDVersion[1] == 'B' ||
+ info.szCSDVersion[1] == 'C' )
+ {
+ str = _("Windows 98 SE");
+ }
+ else
+ {
+ str = _("Windows 98");
+ }
+ break;
+ case 90:
+ str = _("Windows ME");
+ break;
+ default:
+ str.Printf(_("Windows 9x (%d.%d)"),
+ info.dwMajorVersion,
+ info.dwMinorVersion);
+ break;
+ }
if ( !wxIsEmpty(info.szCSDVersion) )
{
str << _T(" (") << info.szCSDVersion << _T(')');
break;
case VER_PLATFORM_WIN32_NT:
- str.Printf(_T("Windows NT %lu.%lu (build %lu"),
+ if ( info.dwMajorVersion == 5 )
+ {
+ switch ( info.dwMinorVersion )
+ {
+ case 0:
+ str.Printf(_("Windows 2000 (build %lu"),
+ info.dwBuildNumber);
+ break;
+ case 1:
+ str.Printf(_("Windows XP (build %lu"),
+ info.dwBuildNumber);
+ break;
+ case 2:
+ str.Printf(_("Windows Server 2003 (build %lu"),
+ info.dwBuildNumber);
+ break;
+ }
+ }
+ if ( wxIsEmpty(str) )
+ {
+ str.Printf(_("Windows NT %lu.%lu (build %lu"),
info.dwMajorVersion,
info.dwMinorVersion,
info.dwBuildNumber);
+ }
if ( !wxIsEmpty(info.szCSDVersion) )
{
str << _T(", ") << info.szCSDVersion;
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:
#ifdef __WXWINCE__
case VER_PLATFORM_WIN32_CE:
s_ver = wxWINDOWS_CE;
- break;
#endif
}
+#endif
}
}
return info;
}
+wxWinVersion wxGetWinVersion()
+{
+ int verMaj,
+ verMin;
+ switch ( wxGetOsVersion(&verMaj, &verMin) )
+ {
+ case wxWIN95:
+ if ( verMaj == 4 )
+ {
+ switch ( verMin )
+ {
+ case 0:
+ return wxWinVersion_95;
+
+ case 10:
+ return wxWinVersion_98;
+
+ case 90:
+ return wxWinVersion_ME;
+ }
+ }
+ break;
+
+ case wxWINDOWS_NT:
+ switch ( verMaj )
+ {
+ case 3:
+ return wxWinVersion_NT3;
+
+ case 4:
+ return wxWinVersion_NT4;
+
+ case 5:
+ switch ( verMin )
+ {
+ case 0:
+ return wxWinVersion_2000;
+
+ case 1:
+ return wxWinVersion_XP;
+
+ case 2:
+ return wxWinVersion_2003;
+ }
+ break;
+
+ case 6:
+ return wxWinVersion_NT6;
+ }
+ break;
+
+ }
+
+ return wxWinVersion_Unknown;
+}
+
// ----------------------------------------------------------------------------
// sleep functions
// ----------------------------------------------------------------------------
case wxFONTENCODING_CP936:
return GB2312_CHARSET;
+#ifndef __WXWINCE__
case wxFONTENCODING_CP949:
return HANGUL_CHARSET;
+#endif
case wxFONTENCODING_CP950:
return CHINESEBIG5_CHARSET;
extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
{
- // translate encoding into the Windows CHARSET
- long charset = wxEncodingToCharset(encoding);
- if ( charset == -1 )
- return -1;
+ // There don't seem to be symbolic names for
+ // these under Windows so I just copied the
+ // values from MSDN.
+
+ unsigned int ret;
- // translate CHARSET to code page
- CHARSETINFO csetInfo;
- if ( !::TranslateCharsetInfo((DWORD *)(DWORD)charset,
- &csetInfo,
- TCI_SRCCHARSET) )
+ switch (encoding)
{
- wxLogLastError(_T("TranslateCharsetInfo(TCI_SRCCHARSET)"));
+ 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: 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 = 20932; 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;
+ }
+ if (::IsValidCodePage(ret) == 0)
return -1;
- }
- return csetInfo.ciACP;
+ CPINFO info;
+ if (::GetCPInfo(ret, &info) == 0)
+ return -1;
+
+ return (long) ret;
}
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;
Windows class unregistration).
pclassname is a pointer to a caller stored classname, which must initially be
- NULL. classname is the desired wndclass classname. If function succesfully
+ NULL. classname is the desired wndclass classname. If function successfully
registers the class, pclassname will be set to classname.
*/
extern "C" WXDLLIMPEXP_BASE HWND
return hwnd;
}
-
projects / wxWidgets.git / blobdiff