diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2008-12-27 19:22:30 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2008-12-27 19:22:30 +0000 |
| commit | d34cc411e07122f8ace8ba25242a0a0a2e22b0c1 (patch) | |
| tree | d3b4df5846201f415a8e59cf2c516e9456696d5b /FL | |
| parent | a3589a181717329808ec595edce8e68629b7ade2 (diff) | |
STR 2101: fl_set_spot() could crash on Windows under certain conditions.
The Windows version needs a window to anchor the display window for complex
text editing (IME), e.g. Japanese text. This update adds an additional
Fl_Window argument to fl_set_spot(), but this is only used for Windows.
The implemented version is tested with Japanese text input, including input
in subwindows (test/subwindow.cxx).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6605 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/fl_draw.H | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/FL/fl_draw.H b/FL/fl_draw.H index dc6c8f6cc..c6f5c52c1 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -34,6 +34,7 @@ #define fl_draw_H #include "Enumerations.H" // for the color names +#include "Fl_Window.H" // for fl_set_spot() // Image class... class Fl_Image; @@ -277,7 +278,7 @@ FL_EXPORT const char* fl_expand_text(const char* from, char* buf, int maxbuf, // XIM: FL_EXPORT void fl_set_status(int X, int Y, int W, int H); -FL_EXPORT void fl_set_spot(int font, int size, int x, int y, int w, int h); +FL_EXPORT void fl_set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win=0); FL_EXPORT void fl_reset_spot(void); |