Have headers x.H, win32.H and mac.H share a unique definition of class Fl_X

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11667 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 11 insertions, 15 deletions

diff --git a/src/Fl.cxx b/src/Fl.cxx
index eb00a411d..534a7d8e0 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1967,6 +1967,11 @@ void fl_close_display()
   Fl::screen_driver()->close_display();
 }
 
+FL_EXPORT Window fl_xid_(const Fl_Window *w) {
+  Fl_X *temp = Fl_X::i(w);
+  return temp ? temp->xid : 0;
+}
+
 //
 // End of "$Id$".
 //
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index f545e987b..e2c4046da 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -4224,12 +4224,6 @@ CGImageRef Fl_Cocoa_Window_Driver::CGImage_from_window_rect(int x, int y, int w,
   return img;
 }
 
-Window fl_xid(const Fl_Window* w)
-{
-  Fl_X *temp = Fl_X::i(w);
-  return temp ? temp->xid : 0;
-}
-
 int Fl_Cocoa_Window_Driver::decorated_w()
 {
   if (!shown() || parent() || !border() || !visible())
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 49814dd59..4e9030cd3 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -2381,11 +2381,6 @@ void fl_cleanup_dc_list(void) {          // clean up the list
   } while(t);
 }
 
-FL_EXPORT Window fl_xid_(const Fl_Window *w) {
-  Fl_X *temp = Fl_X::i(w);
-  return temp ? temp->xid : 0;
-}
-
 /* Returns images of the captures of the window title-bar, and the left, bottom and right window borders.
  This function exploits a feature of Fl_WinAPI_Screen_Driver::read_win_rectangle() which,
  when fl_gc is set to the screen device context, captures the window decoration.
@@ -2434,6 +2429,10 @@ void Fl_WinAPI_Window_Driver::capture_titlebar_and_borders(Fl_Shared_Image*& top
   previous->Fl_Surface_Device::set_current();
 }
 
+
+FL_EXPORT void fl_open_callback(void (*)(const char *)) {}
+
+
 #ifdef USE_PRINT_BUTTON
 // to test the Fl_Printer class creating a "Print front window" button in a separate window
 // contains also preparePrintFront call above
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index a8b488e6b..e18157a45 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -2831,10 +2831,8 @@ void Fl_X11_Window_Driver::show() {
 }
 
 
-FL_EXPORT Window fl_xid_(const Fl_Window *w) {
-  Fl_X *temp = Fl_X::i(w);
-  return temp ? temp->xid : 0;
-}
+FL_EXPORT void fl_open_callback(void (*)(const char *)) {}
+
 
 //#define USE_PRINT_BUTTON 1
 #ifdef USE_PRINT_BUTTON