Bug 866736 - InputScope support for IMM32 with CUAS, fix bustage without Win8 SDK, r=jmathies
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 02 May 2013 17:37:35 +0200
changeset 130636 9dbaa660e5e268bc4b1af8e228c29968710b1be9
parent 130635 f61587eeaf528b1605a21d71368718843a1d6394
child 130637 b342f87552a33951b0d372255372dfdd16c20bd6
push id24627
push userryanvm@gmail.com
push dateFri, 03 May 2013 01:34:43 +0000
treeherdermozilla-central@cdd14d9b3aae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmathies
bugs866736
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 866736 - InputScope support for IMM32 with CUAS, fix bustage without Win8 SDK, r=jmathies
widget/windows/nsTextStore.cpp
widget/windows/nsTextStore.h
--- a/widget/windows/nsTextStore.cpp
+++ b/widget/windows/nsTextStore.cpp
@@ -43,18 +43,16 @@ using namespace mozilla::widget;
  *   "TSF: 0x%p   nsFoo::Bar("
  * When a static method is called, start with following text:
  *   "TSF: nsFoo::Bar("
  */
 
 PRLogModuleInfo* sTextStoreLog = nullptr;
 #endif // #ifdef PR_LOGGING
 
-#define IS_SEARCH static_cast<InputScope>(50)
-
 /******************************************************************/
 /* InputScopeImpl                                                 */
 /******************************************************************/
 
 class InputScopeImpl MOZ_FINAL : public ITfInputScope
 {
 public:
   InputScopeImpl(const nsTArray<InputScope>& aList) :
--- a/widget/windows/nsTextStore.h
+++ b/widget/windows/nsTextStore.h
@@ -19,16 +19,19 @@
 
 // GUID_PROP_INPUTSCOPE is declared in inputscope.h using INIT_GUID.
 // With initguid.h, we get its instance instead of extern declaration.
 #ifdef INPUTSCOPE_INIT_GUID
 #include <initguid.h>
 #endif
 #include <inputscope.h>
 
+// TSF InputScope, for earlier SDK 8
+#define IS_SEARCH static_cast<InputScope>(50)
+
 struct ITfThreadMgr;
 struct ITfDocumentMgr;
 struct ITfDisplayAttributeMgr;
 struct ITfCategoryMgr;
 class nsWindow;
 class nsTextEvent;
 #ifdef MOZ_METRO
 class MetroWidget;