summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-01-12 09:24:03 +0000
committerManolo Gouy <Manolo>2011-01-12 09:24:03 +0000
commit77204efa1cded0647168f06da906485bc73c6ede (patch)
tree38b3a1048ae5c01b25f0e8bb1dae0863ee644ead /src
parent0cfc13260167c54911e27c8a3abc917c243cef41 (diff)
X11 specific: made class Fl_X visible only if FL_LIBRARY is defined before compilation,
as discussed in fltk.development ("Fl_X not exported on mac in 1.3"). Tested OK with configure+make and CMake. At this point, the FL_X class remains to be hidden on the WIN32 platform. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8268 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Fl_x.cxx4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c0862717d..0c0865ae1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -193,8 +193,8 @@ set(CFILES
fl_utf.c
)
+add_definitions(-DFL_LIBRARY)
if(APPLE)
- add_definitions(-DFL_LIBRARY)
set(MMFILES
Fl_cocoa.mm
Fl_Quartz_Printer.mm
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 9eff16f63..e981faa93 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1873,7 +1873,11 @@ void Fl_Window::make_current() {
// update the cairo_t context
if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this);
#endif
+}
+Window fl_xid(const Fl_Window* w)
+{
+ return Fl_X::i(w)->xid;
}
#ifdef USE_PRINT_BUTTON