mirror of
https://github.com/fltk/fltk.git
synced 2026-06-01 23:06:54 +08:00
Made sure FL/x.H is included only when necessary.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8130 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -33,18 +33,11 @@
|
|||||||
#ifndef Fl_Device_H
|
#ifndef Fl_Device_H
|
||||||
#define Fl_Device_H
|
#define Fl_Device_H
|
||||||
|
|
||||||
#include <FL/x.H>
|
|
||||||
#include <FL/Fl_Plugin.H>
|
#include <FL/Fl_Plugin.H>
|
||||||
#include <FL/Fl_Image.H>
|
#include <FL/Fl_Image.H>
|
||||||
#include <FL/Fl_Bitmap.H>
|
#include <FL/Fl_Bitmap.H>
|
||||||
#include <FL/Fl_Pixmap.H>
|
#include <FL/Fl_Pixmap.H>
|
||||||
#include <FL/Fl_RGB_Image.H>
|
#include <FL/Fl_RGB_Image.H>
|
||||||
#ifdef WIN32
|
|
||||||
#include <commdlg.h>
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
#else
|
|
||||||
#include <stdio.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class Fl_Graphics_Driver;
|
class Fl_Graphics_Driver;
|
||||||
class Fl_Display_Device;
|
class Fl_Display_Device;
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
#define Fl_Paged_Device_H
|
#define Fl_Paged_Device_H
|
||||||
|
|
||||||
#include <FL/Fl_Device.H>
|
#include <FL/Fl_Device.H>
|
||||||
|
#include <FL/Fl_Window.H>
|
||||||
|
|
||||||
/** \brief Number of elements in enum Page_Format */
|
/** \brief Number of elements in enum Page_Format */
|
||||||
#define NO_PAGE_FORMATS 30 /* MSVC6 compilation fix */
|
#define NO_PAGE_FORMATS 30 /* MSVC6 compilation fix */
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
#ifndef Fl_Printer_H
|
#ifndef Fl_Printer_H
|
||||||
#define Fl_Printer_H
|
#define Fl_Printer_H
|
||||||
|
|
||||||
|
#include <FL/x.H>
|
||||||
#include <FL/Fl_Paged_Device.H>
|
#include <FL/Fl_Paged_Device.H>
|
||||||
#include <FL/fl_draw.H>
|
#include <FL/fl_draw.H>
|
||||||
#include <FL/Fl_Pixmap.H>
|
#include <FL/Fl_Pixmap.H>
|
||||||
@@ -39,6 +40,8 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#if !(defined(__APPLE__) || defined(WIN32))
|
#if !(defined(__APPLE__) || defined(WIN32))
|
||||||
#include <FL/Fl_PostScript.H>
|
#include <FL/Fl_PostScript.H>
|
||||||
|
#elif defined(WIN32)
|
||||||
|
#include <Commdlg.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__APPLE__) || defined(WIN32) || defined(FL_DOXYGEN)
|
#if defined(__APPLE__) || defined(WIN32) || defined(FL_DOXYGEN)
|
||||||
|
|||||||
+4
-3
@@ -33,9 +33,10 @@
|
|||||||
#ifndef fl_draw_H
|
#ifndef fl_draw_H
|
||||||
#define fl_draw_H
|
#define fl_draw_H
|
||||||
|
|
||||||
#include "Enumerations.H" // for the color names
|
#include <FL/x.H> // for Fl_Region
|
||||||
#include "Fl_Window.H" // for fl_set_spot()
|
#include <FL/Enumerations.H> // for the color names
|
||||||
#include "Fl_Device.H"
|
#include <FL/Fl_Window.H> // for fl_set_spot()
|
||||||
|
#include <FL/Fl_Device.H> // for fl_graphics_driver
|
||||||
|
|
||||||
// Image class...
|
// Image class...
|
||||||
class Fl_Image;
|
class Fl_Image;
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
#if !defined(Fl_X_H)
|
#if !defined(Fl_X_H)
|
||||||
# error "Never use <FL/mac.H> directly; include <FL/x.H> instead."
|
# error "Never use <FL/mac.H> directly; include <FL/x.H> instead."
|
||||||
#endif // !Fl_X_H
|
#endif // !Fl_X_H
|
||||||
|
#include <FL/Fl_Widget.H>
|
||||||
|
|
||||||
typedef void* Window; // this is really a pointer to the subclass FLWindow of NSWindow
|
typedef void* Window; // this is really a pointer to the subclass FLWindow of NSWindow
|
||||||
typedef void* Fl_Offscreen; // this is really a CGContextRef
|
typedef void* Fl_Offscreen; // this is really a CGContextRef
|
||||||
|
|||||||
Reference in New Issue
Block a user