diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2011-01-11 20:50:36 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2011-01-11 20:50:36 +0000 |
| commit | 9c0c450cbdbe257c24baf9c0754d457a55fdfa89 (patch) | |
| tree | 972212d3db30fc60a9d0f40316416d28af9769f0 | |
| parent | 645e86a30c63ba2d8aeca60fa1511bf57c2c5530 (diff) | |
Fixed accidental commit of some eperimental dead key preview code. STR 2515
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8262 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_win32.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 954b599f4..f061020fa 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1067,8 +1067,9 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar break; } } - } else if ((lParam & (1<<31))==0){ - if ((lParam & (1<<24))==0) { // clear if dead key (always?) + } else if ((lParam & (1<<31))==0) { +#ifdef FLTK_PREVIEW_DEAD_KEYS + if ((lParam & (1<<24))==0) { // clear if dead key (always?) xchar u = (xchar) wParam; Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1); buffer[Fl::e_length] = 0; @@ -1076,6 +1077,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar buffer[0] = 0; Fl::e_length = 0; } +#else + buffer[0] = 0; + Fl::e_length = 0; +#endif } Fl::e_text = buffer; if (lParam & (1<<31)) { // key up events. |