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/Fl_win32.cxx | |
| 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/Fl_win32.cxx')
| -rw-r--r-- | src/Fl_win32.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index c3ea187bf..3bf114404 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -163,13 +163,13 @@ static HMODULE get_wsock_mod() { */ static HMODULE s_imm_module = 0; typedef BOOL (WINAPI* flTypeImmAssociateContextEx)(HWND, HIMC, DWORD); -static flTypeImmAssociateContextEx flImmAssociateContextEx = 0; +flTypeImmAssociateContextEx flImmAssociateContextEx = 0; typedef HIMC (WINAPI* flTypeImmGetContext)(HWND); -static flTypeImmGetContext flImmGetContext = 0; +flTypeImmGetContext flImmGetContext = 0; typedef BOOL (WINAPI* flTypeImmSetCompositionWindow)(HIMC, LPCOMPOSITIONFORM); -static flTypeImmSetCompositionWindow flImmSetCompositionWindow = 0; +flTypeImmSetCompositionWindow flImmSetCompositionWindow = 0; typedef BOOL (WINAPI* flTypeImmReleaseContext)(HWND, HIMC); -static flTypeImmReleaseContext flImmReleaseContext = 0; +flTypeImmReleaseContext flImmReleaseContext = 0; static void get_imm_module() { s_imm_module = LoadLibrary("IMM32.DLL"); @@ -1095,14 +1095,14 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar R = CreateRectRgn(0,0,0,0); int r = GetUpdateRgn(hWnd,R,0); if (r==NULLREGION && !redraw_whole_window) { - Fl_Graphics_Driver::XDestroyRegion(R); + Fl_Graphics_Driver::default_driver().XDestroyRegion(R); break; } if (i->region) { // Also tell WIN32 that we are drawing someplace else as well... CombineRgn(i->region, i->region, R, RGN_OR); - Fl_Graphics_Driver::XDestroyRegion(R); + Fl_Graphics_Driver::default_driver().XDestroyRegion(R); } else { i->region = R; } @@ -2502,6 +2502,8 @@ void preparePrintFront(void) } #endif // USE_PRINT_BUTTON + + #endif // defined(WIN32) and !defined(FL_DOXYGEN) // |