Make hybrid Wayland/X11 platform.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
index 87adc44f0..188bd1d2d 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -75,6 +75,10 @@ static FL_BLENDFUNCTION blendfunc = { 0, 0, 255, 1};
  */
 HDC fl_gc = 0;
 
+
+HDC fl_win32_gc() { return fl_gc; }
+
+
 Fl_GDI_Graphics_Driver::Fl_GDI_Graphics_Driver() {
   mask_bitmap_ = NULL;
   gc_ = NULL;
@@ -157,7 +161,7 @@ void Fl_GDI_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Offsc
   if (w <= 0 || h <= 0) return;
   HDC new_gc = CreateCompatibleDC(gc_);
   int save = SaveDC(new_gc);
-  SelectObject(new_gc, bitmap);
+  SelectObject(new_gc, (HBITMAP)bitmap);
   BitBlt(gc_, x, y, w, h, new_gc, srcx, srcy, SRCCOPY);
   RestoreDC(new_gc, save);
   DeleteDC(new_gc);
@@ -211,8 +215,8 @@ void Fl_GDI_Graphics_Driver::untranslate_all() {
 #endif
 
 void Fl_GDI_Graphics_Driver::add_rectangle_to_region(Fl_Region r, int X, int Y, int W, int H) {
-  Fl_Region R = XRectangleRegion(X, Y, W, H);
-  CombineRgn(r, r, R, RGN_OR);
+  HRGN R = (HRGN)XRectangleRegion(X, Y, W, H);
+  CombineRgn((HRGN)r, (HRGN)r, R, RGN_OR);
   XDestroyRegion(R);
 }
 
@@ -241,7 +245,7 @@ Fl_Region Fl_GDI_Graphics_Driver::XRectangleRegion(int x, int y, int w, int h) {
 }
 
 void Fl_GDI_Graphics_Driver::XDestroyRegion(Fl_Region r) {
-  DeleteObject(r);
+  DeleteObject((HRGN)r);
 }
 
 
@@ -287,7 +291,7 @@ HRGN Fl_GDI_Graphics_Driver::scale_region(HRGN r, float f, Fl_GDI_Graphics_Drive
 
 
 Fl_Region Fl_GDI_Graphics_Driver::scale_clip(float f) {
-  HRGN r = rstack[rstackptr];
+  HRGN r = (HRGN)rstack[rstackptr];
   HRGN r2 = scale_region(r, f, this);
   return (r == r2 ? NULL : (rstack[rstackptr] = r2, r));
 }