mirror of
https://github.com/fltk/fltk.git
synced 2026-06-02 15:46:52 +08:00
Remove a bunch of useless #include <FL/x.H> directives.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11422 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -22,9 +22,6 @@
|
|||||||
#ifndef Fl_Pixmap_H
|
#ifndef Fl_Pixmap_H
|
||||||
#define Fl_Pixmap_H
|
#define Fl_Pixmap_H
|
||||||
# include "Fl_Image.H"
|
# include "Fl_Image.H"
|
||||||
#if defined(WIN32)
|
|
||||||
# include "x.H"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class Fl_Widget;
|
class Fl_Widget;
|
||||||
struct Fl_Menu_Item;
|
struct Fl_Menu_Item;
|
||||||
|
|||||||
@@ -19,8 +19,7 @@
|
|||||||
#ifndef Fl_Sys_Menu_Bar_H
|
#ifndef Fl_Sys_Menu_Bar_H
|
||||||
#define Fl_Sys_Menu_Bar_H
|
#define Fl_Sys_Menu_Bar_H
|
||||||
|
|
||||||
#include "Fl_Menu_Bar.H"
|
#include <FL/Fl_Menu_Bar.H>
|
||||||
#include "x.H"
|
|
||||||
|
|
||||||
#if defined(__APPLE__) || defined(FL_DOXYGEN) // PORTME: Fl_Screen_Driver - system menu bar
|
#if defined(__APPLE__) || defined(FL_DOXYGEN) // PORTME: Fl_Screen_Driver - system menu bar
|
||||||
|
|
||||||
|
|||||||
+2
-3
@@ -24,13 +24,12 @@
|
|||||||
#ifndef fl_draw_H
|
#ifndef fl_draw_H
|
||||||
#define fl_draw_H
|
#define fl_draw_H
|
||||||
|
|
||||||
#include <FL/x.H> // for Fl_Region
|
|
||||||
#include <FL/Enumerations.H> // for the color names
|
#include <FL/Enumerations.H> // for the color names
|
||||||
#include <FL/Fl_Window.H> // for fl_set_spot()
|
#include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver + Fl_Region
|
||||||
#include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver
|
|
||||||
|
|
||||||
// Image class...
|
// Image class...
|
||||||
class Fl_Image;
|
class Fl_Image;
|
||||||
|
class Fl_Window;
|
||||||
|
|
||||||
// Label flags...
|
// Label flags...
|
||||||
FL_EXPORT extern char fl_draw_shortcut;
|
FL_EXPORT extern char fl_draw_shortcut;
|
||||||
|
|||||||
@@ -408,7 +408,6 @@ void exit_cb(Fl_Widget *,void *) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
# include <FL/x.H>
|
|
||||||
|
|
||||||
void
|
void
|
||||||
apple_open_cb(const char *c) {
|
apple_open_cb(const char *c) {
|
||||||
|
|||||||
@@ -34,7 +34,6 @@
|
|||||||
#include <FL/Fl_Window_Driver.H>
|
#include <FL/Fl_Window_Driver.H>
|
||||||
#include <FL/Fl_Window.H>
|
#include <FL/Fl_Window.H>
|
||||||
#include <FL/Fl_Tooltip.H>
|
#include <FL/Fl_Tooltip.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/Fl_Double_Window.H>
|
#include <FL/Fl_Double_Window.H>
|
||||||
#include <FL/Fl_Printer.H>
|
#include <FL/Fl_Printer.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/Fl_Window_Driver.H>
|
#include <FL/Fl_Window_Driver.H>
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,6 @@
|
|||||||
#include <FL/Fl_Help_View.H>
|
#include <FL/Fl_Help_View.H>
|
||||||
#include <FL/Fl_Window.H>
|
#include <FL/Fl_Window.H>
|
||||||
#include <FL/Fl_Pixmap.H>
|
#include <FL/Fl_Pixmap.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <FL/fl_utf8.h>
|
#include <FL/fl_utf8.h>
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
#include "config_lib.h"
|
#include "config_lib.h"
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/Fl_Widget.H>
|
#include <FL/Fl_Widget.H>
|
||||||
#include <FL/Fl_Menu_Item.H>
|
#include <FL/Fl_Menu_Item.H>
|
||||||
#include <FL/Fl_Image.H>
|
#include <FL/Fl_Image.H>
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/Fl_Menu_Window.H>
|
#include <FL/Fl_Menu_Window.H>
|
||||||
#include <FL/Fl_Window_Driver.H>
|
#include <FL/Fl_Window_Driver.H>
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/Fl_Overlay_Window.H>
|
#include <FL/Fl_Overlay_Window.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/Fl_Window_Driver.H>
|
#include <FL/Fl_Window_Driver.H>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/Fl_Widget.H>
|
#include <FL/Fl_Widget.H>
|
||||||
#include <FL/Fl_Menu_Item.H>
|
#include <FL/Fl_Menu_Item.H>
|
||||||
#include <FL/Fl_Pixmap.H>
|
#include <FL/Fl_Pixmap.H>
|
||||||
|
|||||||
@@ -20,9 +20,9 @@
|
|||||||
// which are actually X keysyms. So this has to translate to macOS
|
// which are actually X keysyms. So this has to translate to macOS
|
||||||
// symbols.
|
// symbols.
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/x.H>
|
#include <FL/x.H>
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
// The list of Mac OS virtual keycodes appears with OS 10.5 in
|
// The list of Mac OS virtual keycodes appears with OS 10.5 in
|
||||||
// ...../Carbon.framework/Frameworks/HIToolbox.framework/Headers/Events.h
|
// ...../Carbon.framework/Frameworks/HIToolbox.framework/Headers/Events.h
|
||||||
|
|||||||
@@ -34,7 +34,6 @@
|
|||||||
|
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "flstring.h"
|
#include "flstring.h"
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
#include "flstring.h"
|
#include "flstring.h"
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include "Fl_Font.H"
|
#include "Fl_Font.H"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
// http://www.fltk.org/str.php
|
// http://www.fltk.org/str.php
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include "flstring.h"
|
#include "flstring.h"
|
||||||
|
|||||||
@@ -32,7 +32,6 @@
|
|||||||
#include <FL/Fl_Widget.H>
|
#include <FL/Fl_Widget.H>
|
||||||
#include <FL/Fl_Printer.H>
|
#include <FL/Fl_Printer.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
// all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx
|
// all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
// Also see fl_set_fonts.cxx which adds all possible fonts.
|
// Also see fl_set_fonts.cxx which adds all possible fonts.
|
||||||
|
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include "flstring.h"
|
#include "flstring.h"
|
||||||
#include "Fl_Font.H"
|
#include "Fl_Font.H"
|
||||||
|
|||||||
@@ -40,9 +40,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "flstring.h"
|
#include "flstring.h"
|
||||||
#if !defined(WIN32) && !defined(__APPLE__) // PORTME: Fl_Screen_Driver - platform keyboard feel
|
|
||||||
#include <FL/x.H>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Screen_Driver - platform keyboard feel
|
#if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Screen_Driver - platform keyboard feel
|
||||||
#elif defined(FL_PORTING)
|
#elif defined(FL_PORTING)
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "config_lib.h"
|
#include "config_lib.h"
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/math.h>
|
#include <FL/math.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user