summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2020-02-03 15:58:13 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2020-02-03 15:58:13 +0100
commitb8ab77e39c01b9019edaeaa09d5d08c7b21f75ab (patch)
treee82178b792dcb56ee484aaa331dc1c975d8f40f2
parenta9bdb7a7b4875060fcd984f342cd974a3c3f18ee (diff)
Don't "export" X11 specific fl_open_display() function
The X11 specific overloaded function fl_open_display(Display *) has never been documented but exposed (and "exported" in the ABI) in FL/platform.H which is not necessary. This internal function is now static and no longer exposed in the ABI. Don't confuse with fl_open_display() w/o arguments which is still exported and declared in FL/platform.H.
-rw-r--r--FL/platform.H8
-rw-r--r--src/Fl_x.cxx6
2 files changed, 7 insertions, 7 deletions
diff --git a/FL/platform.H b/FL/platform.H
index 2944e9333..834e30f81 100644
--- a/FL/platform.H
+++ b/FL/platform.H
@@ -3,17 +3,17 @@
//
// Platform header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
// file is missing or damaged, see the license at:
//
-// http://www.fltk.org/COPYING.php
+// https://www.fltk.org/COPYING.php
//
// Please report all bugs and problems on the following page:
//
-// http://www.fltk.org/str.php
+// https://www.fltk.org/str.php
//
// These are FLTK symbols that are necessary or useful for calling
@@ -57,8 +57,6 @@ class Fl_Window;
# endif
# include <X11/Xatom.h>
-FL_EXPORT void fl_open_display(Display*);
-
// constant info about the X server connection:
extern FL_EXPORT Display *fl_display;
extern FL_EXPORT int fl_screen;
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index c5b481707..ab092f279 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -77,6 +77,8 @@ static bool have_xfixes = false;
extern Fl_Widget *fl_selection_requestor;
+static void open_display_i(Display *d); // open display (internal)
+
////////////////////////////////////////////////////////////////
// interface to poll/select call:
@@ -614,14 +616,14 @@ void Fl_X11_Screen_Driver::open_display_platform() {
Display *d = XOpenDisplay(0);
if (!d) Fl::fatal("Can't open display: %s",XDisplayName(0));
- fl_open_display(d);
+ open_display_i(d);
// the unique GC used by all X windows
GC gc = XCreateGC(fl_display, RootWindow(fl_display, fl_screen), 0, 0);
Fl_Graphics_Driver::default_driver().gc(gc);
}
-void fl_open_display(Display* d) {
+void open_display_i(Display* d) {
fl_display = d;
WM_DELETE_WINDOW = XInternAtom(d, "WM_DELETE_WINDOW", 0);