diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-04-17 17:45:44 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-04-17 17:45:44 +0000 |
| commit | e2495a760a7c5987724467923b9beb57c50ccfeb (patch) | |
| tree | ea46433ed29b0f33199080e199f6fafcd2fb2913 /src/drivers | |
| parent | cdf85352c42dd2f3b43703897148e8fa513c9cdc (diff) | |
MSWindows fixes for previous commits.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11644 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 10 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 47cc9383c..e10191ec2 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -179,6 +179,16 @@ void Fl_GDI_Graphics_Driver::XDestroyRegion(Fl_Region r) { } +typedef BOOL(WINAPI* flTypeImmAssociateContextEx)(HWND, HIMC, DWORD); +extern flTypeImmAssociateContextEx flImmAssociateContextEx; +typedef HIMC(WINAPI* flTypeImmGetContext)(HWND); +extern flTypeImmGetContext flImmGetContext; +typedef BOOL(WINAPI* flTypeImmSetCompositionWindow)(HIMC, LPCOMPOSITIONFORM); +extern flTypeImmSetCompositionWindow flImmSetCompositionWindow; +typedef BOOL(WINAPI* flTypeImmReleaseContext)(HWND, HIMC); +extern flTypeImmReleaseContext flImmReleaseContext; + + void Fl_GDI_Graphics_Driver::reset_spot() { } diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index 89bd68fee..a7b068e69 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -450,7 +450,7 @@ void Fl_WinAPI_Window_Driver::hide() { # endif } - if (ip->region) Fl_Graphics_Driver::XDestroyRegion(ip->region); + if (ip->region) Fl_Graphics_Driver::default_driver().XDestroyRegion(ip->region); // this little trickery seems to avoid the popup window stacking problem HWND p = GetForegroundWindow(); |