avoid deferred show with Fluxbox, its support for _NET_REQUEST_FRAME_EXTENTS is broken

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 7779e616da28a2f1f06e872ffe3ba126f85bcd0e..fd36d634b193ebfe00c10280fb17f66e97cd5c79 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -127,13 +127,19 @@ static const wxChar eUSERNAME[]  = wxT("UserName");
 // ----------------------------------------------------------------------------
 
 // Get hostname only (without domain name)
 // ----------------------------------------------------------------------------
 
 // Get hostname only (without domain name)

-bool wxGetHostName(wxChar *WXUNUSED_IN_WINCE(buf),
-                   int WXUNUSED_IN_WINCE(maxSize))
+bool wxGetHostName(wxChar *buf, int maxSize)

 {
 #if defined(__WXWINCE__)
 {
 #if defined(__WXWINCE__)

-    // TODO-CE
-    return false;
-#else
+    // GetComputerName() is not supported but the name seems to be stored in
+    // this location in the registry, at least for PPC2003 and WM5
+    wxString hostName;
+    wxRegKey regKey(wxRegKey::HKLM, wxT("Ident"));
+    if ( !regKey.HasValue(wxT("Name")) ||
+            !regKey.QueryValue(wxT("Name"), hostName) )
+        return false;
+
+    wxStrlcpy(buf, hostName.wx_str(), maxSize);
+#else // !__WXWINCE__

     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {


@@ -141,9 +147,9 @@ bool wxGetHostName(wxChar *WXUNUSED_IN_WINCE(buf),
 
         return false;
     }
 
         return false;
     }

+#endif // __WXWINCE__/!__WXWINCE__

 
     return true;
 
     return true;

-#endif

 }
 
 // get full hostname (with domain name if possible)
 }
 
 // get full hostname (with domain name if possible)


@@ -157,7 +163,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
     // missing, we handle this)
     wxLogNull noLog;
 
     // missing, we handle this)
     wxLogNull noLog;
 

-    wxDynamicLibrary dllWinsock(_T("ws2_32.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dllWinsock(wxT("ws2_32.dll"), wxDL_VERBATIM);

     if ( dllWinsock.IsLoaded() )
     {
         typedef int (PASCAL *WSAStartup_t)(WORD, WSADATA *);
     if ( dllWinsock.IsLoaded() )
     {
         typedef int (PASCAL *WSAStartup_t)(WORD, WSADATA *);


@@ -168,7 +174,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 
         #define LOAD_WINSOCK_FUNC(func)                                       \
             func ## _t                                                        \
 
         #define LOAD_WINSOCK_FUNC(func)                                       \
             func ## _t                                                        \

-                pfn ## func = (func ## _t)dllWinsock.GetSymbol(_T(#func))
+                pfn ## func = (func ## _t)dllWinsock.GetSymbol(wxT(#func))

 
         LOAD_WINSOCK_FUNC(WSAStartup);
 
 
         LOAD_WINSOCK_FUNC(WSAStartup);
 


@@ -258,7 +264,7 @@ bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf),
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
     wxCHECK_MSG( buf && ( maxSize > 0 ), false,
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
     wxCHECK_MSG( buf && ( maxSize > 0 ), false,

-                    _T("empty buffer in wxGetUserName") );
+                    wxT("empty buffer in wxGetUserName") );

 #if defined(__WXWINCE__) && wxUSE_REGKEY
     wxLogNull noLog;
     wxRegKey key(wxRegKey::HKCU, wxT("ControlPanel\\Owner"));
 #if defined(__WXWINCE__) && wxUSE_REGKEY
     wxLogNull noLog;
     wxRegKey key(wxRegKey::HKCU, wxT("ControlPanel\\Owner"));


@@ -473,7 +479,7 @@ bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
     GetDiskFreeSpaceEx_t
         pGetDiskFreeSpaceEx = (GetDiskFreeSpaceEx_t)::GetProcAddress
                               (
     GetDiskFreeSpaceEx_t
         pGetDiskFreeSpaceEx = (GetDiskFreeSpaceEx_t)::GetProcAddress
                               (

-                                ::GetModuleHandle(_T("kernel32.dll")),
+                                ::GetModuleHandle(wxT("kernel32.dll")),

 #if wxUSE_UNICODE
                                 "GetDiskFreeSpaceExW"
 #else
 #if wxUSE_UNICODE
                                 "GetDiskFreeSpaceExW"
 #else


@@ -491,7 +497,7 @@ bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
                                   &bytesTotal,
                                   NULL) )
         {
                                   &bytesTotal,
                                   NULL) )
         {

-            wxLogLastError(_T("GetDiskFreeSpaceEx"));
+            wxLogLastError(wxT("GetDiskFreeSpaceEx"));

 
             return false;
         }
 
             return false;
         }


@@ -542,7 +548,7 @@ bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
                                  &lNumberOfFreeClusters,
                                  &lTotalNumberOfClusters) )
         {
                                  &lNumberOfFreeClusters,
                                  &lTotalNumberOfClusters) )
         {

-            wxLogLastError(_T("GetDiskFreeSpace"));
+            wxLogLastError(wxT("GetDiskFreeSpace"));

 
             return false;
         }
 
             return false;
         }


@@ -627,7 +633,7 @@ bool wxDoSetEnv(const wxString& var, const wxChar *value)
 #else // other compiler
     if ( !::SetEnvironmentVariable(var.t_str(), value) )
     {
 #else // other compiler
     if ( !::SetEnvironmentVariable(var.t_str(), value) )
     {

-        wxLogLastError(_T("SetEnvironmentVariable"));
+        wxLogLastError(wxT("SetEnvironmentVariable"));

 
         return false;
     }
 
         return false;
     }


@@ -764,12 +770,12 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
                         //     can also use SendMesageTimeout(WM_CLOSE)
                         if ( !::PostMessage(params.hwnd, WM_QUIT, 0, 0) )
                         {
                         //     can also use SendMesageTimeout(WM_CLOSE)
                         if ( !::PostMessage(params.hwnd, WM_QUIT, 0, 0) )
                         {

-                            wxLogLastError(_T("PostMessage(WM_QUIT)"));
+                            wxLogLastError(wxT("PostMessage(WM_QUIT)"));

                         }
                     }
                     else // it was an error then
                     {
                         }
                     }
                     else // it was an error then
                     {

-                        wxLogLastError(_T("EnumWindows"));
+                        wxLogLastError(wxT("EnumWindows"));

 
                         ok = false;
                     }
 
                         ok = false;
                     }


@@ -796,16 +802,16 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
                 // process terminated
                 if ( !::GetExitCodeProcess(hProcess, &rc) )
                 {
                 // process terminated
                 if ( !::GetExitCodeProcess(hProcess, &rc) )
                 {

-                    wxLogLastError(_T("GetExitCodeProcess"));
+                    wxLogLastError(wxT("GetExitCodeProcess"));

                 }
                 break;
 
             default:
                 }
                 break;
 
             default:

-                wxFAIL_MSG( _T("unexpected WaitForSingleObject() return") );
+                wxFAIL_MSG( wxT("unexpected WaitForSingleObject() return") );

                 // fall through
 
             case WAIT_FAILED:
                 // fall through
 
             case WAIT_FAILED:

-                wxLogLastError(_T("WaitForSingleObject"));
+                wxLogLastError(wxT("WaitForSingleObject"));

                 // fall through
 
             case WAIT_TIMEOUT:
                 // fall through
 
             case WAIT_TIMEOUT:


@@ -850,7 +856,7 @@ static void InitToolHelp32()
 
 #if wxUSE_DYNLIB_CLASS
 
 
 #if wxUSE_DYNLIB_CLASS
 

-    wxDynamicLibrary dllKernel(_T("kernel32.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dllKernel(wxT("kernel32.dll"), wxDL_VERBATIM);

 
     // Get procedure addresses.
     // We are linking to these functions of Kernel32
 
     // Get procedure addresses.
     // We are linking to these functions of Kernel32


@@ -859,13 +865,13 @@ static void InitToolHelp32()
     // which does not have the Toolhelp32
     // functions in the Kernel 32.
     lpfCreateToolhelp32Snapshot =
     // which does not have the Toolhelp32
     // functions in the Kernel 32.
     lpfCreateToolhelp32Snapshot =

-        (CreateToolhelp32Snapshot_t)dllKernel.RawGetSymbol(_T("CreateToolhelp32Snapshot"));
+        (CreateToolhelp32Snapshot_t)dllKernel.RawGetSymbol(wxT("CreateToolhelp32Snapshot"));

 
     lpfProcess32First =
 
     lpfProcess32First =

-        (Process32_t)dllKernel.RawGetSymbol(_T("Process32First"));
+        (Process32_t)dllKernel.RawGetSymbol(wxT("Process32First"));

 
     lpfProcess32Next =
 
     lpfProcess32Next =

-        (Process32_t)dllKernel.RawGetSymbol(_T("Process32Next"));
+        (Process32_t)dllKernel.RawGetSymbol(wxT("Process32Next"));

 
 #endif // wxUSE_DYNLIB_CLASS
 }
 
 #endif // wxUSE_DYNLIB_CLASS
 }


@@ -1008,7 +1014,7 @@ bool wxShutdown(int WXUNUSED_IN_WINCE(flags))
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown wxShutdown() flag") );
+                wxFAIL_MSG( wxT("unknown wxShutdown() flag") );

                 return false;
         }
 
                 return false;
         }
 


@@ -1054,16 +1060,16 @@ bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS
     // IsDebuggerPresent() is not available under Win95, so load it dynamically
 {
 #if wxUSE_DYNLIB_CLASS
     // IsDebuggerPresent() is not available under Win95, so load it dynamically

-    wxDynamicLibrary dll(_T("kernel32.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dll(wxT("kernel32.dll"), wxDL_VERBATIM);

 
     typedef BOOL (WINAPI *IsDebuggerPresent_t)();
 
     typedef BOOL (WINAPI *IsDebuggerPresent_t)();

-    if ( !dll.HasSymbol(_T("IsDebuggerPresent")) )
+    if ( !dll.HasSymbol(wxT("IsDebuggerPresent")) )

     {
         // no way to know, assume no
         return false;
     }
 
     {
         // no way to know, assume no
         return false;
     }
 

-    return (*(IsDebuggerPresent_t)dll.GetSymbol(_T("IsDebuggerPresent")))() != 0;
+    return (*(IsDebuggerPresent_t)dll.GetSymbol(wxT("IsDebuggerPresent")))() != 0;

 #else
     return false;
 #endif
 #else
     return false;
 #endif


@@ -1167,7 +1173,7 @@ wxString wxGetOsDescription()
                 }
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {
                 }
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {

-                    str << _T(" (") << info.szCSDVersion << _T(')');
+                    str << wxT(" (") << info.szCSDVersion << wxT(')');

                 }
                 break;
 
                 }
                 break;
 


@@ -1220,9 +1226,9 @@ wxString wxGetOsDescription()
 
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {
 
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {

-                    str << _T(", ") << info.szCSDVersion;
+                    str << wxT(", ") << info.szCSDVersion;

                 }
                 }

-                str << _T(')');
+                str << wxT(')');

 
                 if ( wxIsPlatform64Bit() )
                     str << _(", 64-bit edition");
 
                 if ( wxIsPlatform64Bit() )
                     str << _(", 64-bit edition");


@@ -1231,7 +1237,7 @@ wxString wxGetOsDescription()
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( _T("GetVersionEx() failed") ); // should never happen
+        wxFAIL_MSG( wxT("GetVersionEx() failed") ); // should never happen

     }
 
     return str;
     }
 
     return str;


@@ -1245,9 +1251,9 @@ bool wxIsPlatform64Bit()
     // 32-bit programs run on both 32-bit and 64-bit Windows so check
     typedef BOOL (WINAPI *IsWow64Process_t)(HANDLE, BOOL *);
 
     // 32-bit programs run on both 32-bit and 64-bit Windows so check
     typedef BOOL (WINAPI *IsWow64Process_t)(HANDLE, BOOL *);
 

-    wxDynamicLibrary dllKernel32(_T("kernel32.dll"));
+    wxDynamicLibrary dllKernel32(wxT("kernel32.dll"));

     IsWow64Process_t pfnIsWow64Process =
     IsWow64Process_t pfnIsWow64Process =

-        (IsWow64Process_t)dllKernel32.RawGetSymbol(_T("IsWow64Process"));
+        (IsWow64Process_t)dllKernel32.RawGetSymbol(wxT("IsWow64Process"));

 
     BOOL wow64 = FALSE;
     if ( pfnIsWow64Process )
 
     BOOL wow64 = FALSE;
     if ( pfnIsWow64Process )


@@ -1637,7 +1643,7 @@ extern "C" WXDLLIMPEXP_BASE HWND
 wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc)
 {
     wxCHECK_MSG( classname && pclassname && wndproc, NULL,
 wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc)
 {
     wxCHECK_MSG( classname && pclassname && wndproc, NULL,

-                    _T("NULL parameter in wxCreateHiddenWindow") );
+                    wxT("NULL parameter in wxCreateHiddenWindow") );

 
     // register the class fi we need to first
     if ( *pclassname == NULL )
 
     // register the class fi we need to first
     if ( *pclassname == NULL )