applied Unicode fixes for mingw32 (patch 429654)

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 796e131cf0b6adedcdc39b6e285ddb59b75db31a..6020b8780d182b7ee3c29203f59b716dba033cca 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -329,7 +329,7 @@ int wxHexToDec(const wxString& buf)
   else
     secondDigit = buf.GetChar(1) - wxT('0');
 
-  return firstDigit * 16 + secondDigit;
+  return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
 }
 
 // Convert decimal integer to 2-character hex string
@@ -504,23 +504,23 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 else {
                     // several special cases
                     current.MakeUpper();
-                    if ( current == wxT("DEL") ) {
+                    if ( current == _("DEL") ) {
                         keyCode = WXK_DELETE;
                     }
-                    else if ( current == wxT("DELETE") ) {
+                    else if ( current == _("DELETE") ) {
                         keyCode = WXK_DELETE;
                     }
-                    else if ( current == wxT("INS") ) {
+                    else if ( current == _("INS") ) {
                         keyCode = WXK_INSERT;
                     }
-                    else if ( current == wxT("INSERT") ) {
+                    else if ( current == _("INSERT") ) {
                         keyCode = WXK_INSERT;
                     }
 #if 0
-                    else if ( current == wxT("PGUP") ) {
+                    else if ( current == _("PGUP") ) {
                         keyCode = VK_PRIOR;
                     }
-                    else if ( current == wxT("PGDN") ) {
+                    else if ( current == _("PGDN") ) {
                         keyCode = VK_NEXT;
                     }
 #endif
@@ -1071,17 +1071,6 @@ void wxEnableTopLevelWindows(bool enable)
 
 wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
 {
-#ifdef __WXMSW__
-#ifdef __WIN32__
-    // and the top level window too
-    HWND hwndFG = ::GetForegroundWindow();
-    m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
-#else
-    HWND hwndFG = ::GetTopWindow(0);
-    m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
-#endif
-#endif // MSW
-
     // remember the top level windows which were already disabled, so that we
     // don't reenable them later
     m_winDisabled = NULL;
@@ -1123,29 +1112,6 @@ wxWindowDisabler::~wxWindowDisabler()
     }
 
     delete m_winDisabled;
-
-#ifdef __WXMSW__
-#ifdef __WIN32__
-    if ( m_winTop )
-    {
-        if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
-        {
-            wxLogLastError(wxT("SetForegroundWindow"));
-        }
-    }
-#else
-    if ( m_winTop )
-    {
-        // 16-bit SetForegroundWindow() replacement
-        RECT reWin;
-        GetWindowRect((HWND) m_winTop, &reWin);
-        SetWindowPos ((HWND) m_winTop, HWND_TOP,
-                             reWin.left, reWin.top, 
-                             reWin.right - reWin.left, reWin.bottom, 
-                             SWP_SHOWWINDOW);
-    }
-#endif
-#endif // MSW
 }
 
 // Yield to other apps/messages and disable user input to all windows except