From a114e3ab4d9fa408061003c04a95b293b3842f24 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Wed, 23 Mar 2016 13:13:00 +0000
Subject: Rewrite Fl_Window::handle(int) under the driver model.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11403 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Window_Driver.H | 2 ++
 FL/mac.H              | 2 --
 FL/win32.H            | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'FL')

diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index f386e04f4..6ff2a1bab 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -85,6 +85,8 @@ public:
   virtual void resize(int X,int Y,int W,int H) {}
   virtual void hide() {}
   int hide_common();
+  virtual void map() {}
+  virtual void unmap() {}
 
   // --- window shape stuff
   void shape_pixmap_(Fl_Image* pixmap); // TODO: check
diff --git a/FL/mac.H b/FL/mac.H
index a909a294d..0128d1157 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -177,8 +177,6 @@ public:
   static void GLcontext_makecurrent(NSOpenGLContext*);
   static void GL_cleardrawable(void);
   void destroy(void);
-  void map(void);
-  void unmap(void);
   void collapse(void);
   WindowRef window_ref(void); // useless with cocoa GL windows
   void set_key_window(void);
diff --git a/FL/win32.H b/FL/win32.H
index bb8c4050a..f78e63bcc 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -57,10 +57,6 @@ inline void XClipBox(Fl_Region r,XRectangle* rect) {
     rect->width=win_rect.right-win_rect.left;
     rect->height=win_rect.bottom-win_rect.top;
 }
-#define XDestroyWindow(a,b) DestroyWindow(b)
-#define XMapWindow(a,b) ShowWindow(b, SW_RESTORE)
-#define XUnmapWindow(a,b) ShowWindow(b, SW_HIDE)
-
 // this object contains all win32-specific stuff about a window:
 // Warning: this object is highly subject to change!
 class FL_EXPORT Fl_X {
-- 
cgit v1.2.3