Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't "export" X11 specific fl_open_display() function

Browse Source 
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.
This commit is contained in:
Albrecht Schlosser
2020-02-03 15:58:13 +01:00
parent a9bdb7a7b4
commit b8ab77e39c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/platform.H
+3 -5
View File
@@ -3,17 +3,17 @@
// //
// Platform header file for the Fast Light Tool Kit (FLTK). // 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 // 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 // the file "COPYING" which should have been included with this file. If this
// file is missing or damaged, see the license at: // 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: // 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 // These are FLTK symbols that are necessary or useful for calling
@@ -57,8 +57,6 @@ class Fl_Window;
# endif # endif
# include <X11/Xatom.h> # include <X11/Xatom.h>
FL_EXPORT void fl_open_display(Display*);
// constant info about the X server connection: // constant info about the X server connection:
extern FL_EXPORT Display *fl_display; extern FL_EXPORT Display *fl_display;
extern FL_EXPORT int fl_screen; extern FL_EXPORT int fl_screen;
src/Fl_x.cxx
+4 -2
View File
@@ -77,6 +77,8 @@ static bool have_xfixes = false;
extern Fl_Widget *fl_selection_requestor; extern Fl_Widget *fl_selection_requestor;
static void open_display_i(Display *d); // open display (internal)
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// interface to poll/select call: // interface to poll/select call:
@@ -614,14 +616,14 @@ void Fl_X11_Screen_Driver::open_display_platform() {
Display *d = XOpenDisplay(0); Display *d = XOpenDisplay(0);
if (!d) Fl::fatal("Can't open display: %s",XDisplayName(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 // the unique GC used by all X windows
GC gc = XCreateGC(fl_display, RootWindow(fl_display, fl_screen), 0, 0); GC gc = XCreateGC(fl_display, RootWindow(fl_display, fl_screen), 0, 0);
Fl_Graphics_Driver::default_driver().gc(gc); Fl_Graphics_Driver::default_driver().gc(gc);
} }
void fl_open_display(Display* d) { void open_display_i(Display* d) {
fl_display = d; fl_display = d;
WM_DELETE_WINDOW = XInternAtom(d, "WM_DELETE_WINDOW", 0); WM_DELETE_WINDOW = XInternAtom(d, "WM_DELETE_WINDOW", 0);