diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-02-27 17:27:21 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-02-27 17:27:21 +0000 |
| commit | d67e9ccb73bff691d5e5ae53fab64206558c3069 (patch) | |
| tree | 414c78d51f18d4d666e47d9c9ddaefbe422a419e /src/drivers | |
| parent | 85b45416e74106910a7f087e633f80615c67de80 (diff) | |
Fix compiler warnings (STR #2988) - final commit.
This commit includes all fixes from branch-1.3 (svn r 11243) and additional
fixes for warnings that crept in during the porting efforts, particularly
C++ ("//") comments in C and included header files, and some more.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11246 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx | 6 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx index ab416b134..fdff2fe1b 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx @@ -243,8 +243,10 @@ void Fl_GDI_Graphics_Driver::pop_clip() { void Fl_GDI_Graphics_Driver::restore_clip() { fl_clip_state_number++; - Fl_Region r = rstack[rstackptr]; - SelectClipRgn(gc_, r); //if r is NULL, clip is automatically cleared + if (gc_) { + Fl_Region r = rstack[rstackptr]; + SelectClipRgn(gc_, r); // if r is NULL, clip is automatically cleared + } } diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx index c6ca9b674..2d239cc0e 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx @@ -339,9 +339,11 @@ void Fl_Xlib_Graphics_Driver::pop_clip() { void Fl_Xlib_Graphics_Driver::restore_clip() { fl_clip_state_number++; - Fl_Region r = rstack[rstackptr]; - if (r) XSetRegion(fl_display, gc_, r); - else XSetClipMask(fl_display, gc_, 0); + if (gc_) { + Fl_Region r = rstack[rstackptr]; + if (r) XSetRegion(fl_display, gc_, r); + else XSetClipMask(fl_display, gc_, 0); + } } #endif // FL_CFG_GFX_XLIB_RECT_CXX |