Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarley Acheson <harley.acheson@gmail.com>2021-08-04 23:19:16 +0300
committerHarley Acheson <harley.acheson@gmail.com>2021-08-04 23:20:45 +0300
commit1d1020b79ff3ac9cc23921aa2e7ba1ef16c930ce (patch)
tree271d4964af5325feb6c4b763005648a55fd47f84
parent49acc52e02ec9e0577d3fa1f298720139d9f751b (diff)
Win32 IME: Remove ime_status_
This removes one member of GHOST_ImeWin32 that is not used and cannot be used in the future. It is holding the result of ImmIsIME, which is whether an input language supports IME. It does not indicate that one is in use, turned on, composing, in English mode, etc. see D12131 for more information. Differential Revision: https://developer.blender.org/D12131 Reviewed by Ray Molenkamp
-rw-r--r--intern/ghost/intern/GHOST_ImeWin32.cpp10
-rw-r--r--intern/ghost/intern/GHOST_ImeWin32.h16
2 files changed, 3 insertions, 23 deletions
diff --git a/intern/ghost/intern/GHOST_ImeWin32.cpp b/intern/ghost/intern/GHOST_ImeWin32.cpp
index 8daa07b5003..f6baa601db9 100644
--- a/intern/ghost/intern/GHOST_ImeWin32.cpp
+++ b/intern/ghost/intern/GHOST_ImeWin32.cpp
@@ -32,7 +32,6 @@
GHOST_ImeWin32::GHOST_ImeWin32()
: is_composing_(false),
- ime_status_(false),
input_language_id_(LANG_USER_DEFAULT),
conversion_modes_(IME_CMODE_ALPHANUMERIC),
sentence_mode_(IME_SMODE_NONE),
@@ -47,18 +46,13 @@ GHOST_ImeWin32::~GHOST_ImeWin32()
{
}
-bool GHOST_ImeWin32::SetInputLanguage()
+void GHOST_ImeWin32::SetInputLanguage()
{
/**
- * Retrieve the current keyboard layout from Windows and determine whether
- * or not the current input context has IMEs.
- * Also save its input language for language-specific operations required
- * while composing a text.
+ * Retrieve the current input language.
*/
HKL keyboard_layout = ::GetKeyboardLayout(0);
input_language_id_ = LOWORD(keyboard_layout);
- ime_status_ = ::ImmIsIME(keyboard_layout);
- return ime_status_;
}
WORD GHOST_ImeWin32::GetInputLanguage()
diff --git a/intern/ghost/intern/GHOST_ImeWin32.h b/intern/ghost/intern/GHOST_ImeWin32.h
index bcc4b6eef7c..7ccb0cdfd06 100644
--- a/intern/ghost/intern/GHOST_ImeWin32.h
+++ b/intern/ghost/intern/GHOST_ImeWin32.h
@@ -148,13 +148,8 @@ class GHOST_ImeWin32 {
/**
* Retrieves the input language from Windows and update it.
- * Return values
- * * true
- * The given input language has IMEs.
- * * false
- * The given input language does not have IMEs.
*/
- bool SetInputLanguage();
+ void SetInputLanguage();
/* Returns the current input language id. */
WORD GetInputLanguage();
@@ -351,15 +346,6 @@ class GHOST_ImeWin32 {
bool is_composing_;
/**
- * This value represents whether or not the current input context has IMEs.
- * The following table shows the list of IME status:
- * Value Description
- * false The current input language does not have IMEs.
- * true The current input language has IMEs.
- */
- bool ime_status_;
-
- /**
* The current input Language ID retrieved from Windows, which consists of:
* * Primary Language ID (bit 0 to bit 9), which shows a natural language
* (English, Korean, Chinese, Japanese, etc.) and;