equal
deleted
inserted
replaced
54 |
54 |
55 // Uncommend, to show debugging information for the keymapper |
55 // Uncommend, to show debugging information for the keymapper |
56 //#define DEBUG_KEYMAPPER |
56 //#define DEBUG_KEYMAPPER |
57 |
57 |
58 // Implemented elsewhere |
58 // Implemented elsewhere |
59 extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM); |
59 extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM); |
60 |
60 |
61 extern Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id); |
61 extern Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id); |
62 #ifndef LANG_PASHTO |
62 #ifndef LANG_PASHTO |
63 #define LANG_PASHTO 0x63 |
63 #define LANG_PASHTO 0x63 |
64 #endif |
64 #endif |
617 deleteLayouts(); |
617 deleteLayouts(); |
618 |
618 |
619 /* MAKELCID()'s first argument is a WORD, and GetKeyboardLayout() |
619 /* MAKELCID()'s first argument is a WORD, and GetKeyboardLayout() |
620 * returns a DWORD. */ |
620 * returns a DWORD. */ |
621 |
621 |
622 LCID newLCID = MAKELCID((DWORD)GetKeyboardLayout(0), SORT_DEFAULT); |
622 LCID newLCID = MAKELCID((quintptr)GetKeyboardLayout(0), SORT_DEFAULT); |
623 // keyboardInputLocale = qt_localeFromLCID(newLCID); |
623 // keyboardInputLocale = qt_localeFromLCID(newLCID); |
624 |
624 |
625 bool bidi = false; |
625 bool bidi = false; |
626 wchar_t LCIDFontSig[16]; |
626 wchar_t LCIDFontSig[16]; |
627 if (GetLocaleInfo(newLCID, LOCALE_FONTSIGNATURE, LCIDFontSig, sizeof(LCIDFontSig) / sizeof(wchar_t)) |
627 if (GetLocaleInfo(newLCID, LOCALE_FONTSIGNATURE, LCIDFontSig, sizeof(LCIDFontSig) / sizeof(wchar_t)) |