diff options
18 files changed, 26 insertions, 17 deletions
diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 052a102bf..2f67f208d 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -90,8 +90,9 @@ public: /** \brief The destructor */ ~Fl_System_Printer(void); }; // class Fl_System_Printer +#endif -#elif defined(FL_PORTING) +#if defined(FL_PORTING) # pragma message "FL_PORTING: define your own Fl_xxx_Printer class" class Fl_XXX_Printer : public Fl_Paged_Device { @@ -100,7 +101,9 @@ protected: Fl_XXX_Printer(void) { } }; -#else +#endif + +#if defined(FL_DOXYGEN) || !(__APPLE__ || WIN32 || FL_PORTING) /** Print support under Unix/Linux. diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 248c9a933..45144c9a1 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -113,6 +113,7 @@ void Fl_GDI_Graphics_Driver::copy_offscreen(int x,int y,int w,int h,HBITMAP bitm DeleteDC(new_gc); } +#if ! defined(FL_DOXYGEN) void Fl_GDI_Graphics_Driver::copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP bitmap,int srcx,int srcy) { HDC new_gc = CreateCompatibleDC(gc_); int save = SaveDC(new_gc); @@ -129,6 +130,7 @@ void Fl_GDI_Graphics_Driver::copy_offscreen_with_alpha(int x,int y,int w,int h,H RestoreDC(new_gc, save); DeleteDC(new_gc); } +#endif void Fl_Translated_GDI_Graphics_Driver::translate_all(int x, int y) { GetWindowOrgEx((HDC)gc(), origins+depth); diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx index 89597fbc4..23aa0c542 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_GDI_ARCI_CXX /** - \file gdi_arci.cxx + \file Fl_GDI_Graphics_Driver_arci.cxx \brief Utility functions for drawing circles using integers */ diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx index 9518dc6e6..28422599a 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx @@ -28,7 +28,7 @@ #include <stdio.h> /** - \file gdi_line_style.cxx + \file Fl_GDI_Graphics_Driver_line_style.cxx \brief Line style drawing utility hiding different platforms. */ diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx index 0806ceba3..ab416b134 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx @@ -18,7 +18,7 @@ /** - \file gdi_rect.cxx + \file Fl_GDI_Graphics_Driver_rect.cxx \brief MSWindows GDI specific line and polygon drawing with integer coordinates. */ diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx index a5556bbd9..e5d857f7e 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_GDI_VERTEX_CXX /** - \file gdi_vertex.cxx + \file Fl_GDI_Graphics_Driver_vertex.cxx \brief Portable drawing code for drawing arbitrary shapes with simple 2D transformations, implemented for MSWindows GDI. */ diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx index 649f18398..36d36ca12 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_OPENGL_ARCI_CXX /** - \file opengl_arci.cxx + \file Fl_OpenGL_Graphics_Driver_arci.cxx \brief Utility functions for drawing circles using integers */ diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx index b3eea4eb6..a5f9a3f96 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_OPENGL_LINE_STYLE_CXX /** - \file opengl_line_style.cxx + \file Fl_OpenGL_Graphics_Driver_line_style.cxx \brief Line style drawing utility hiding different platforms. */ diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx index 7a1a28da7..457b228b8 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx @@ -21,7 +21,7 @@ /** - \file quartz_rect.cxx + \file Fl_OpenGL_Graphics_Driver_rect.cxx \brief OpenGL specific line and polygon drawing with integer coordinates. */ diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx index 76fd3cf4a..bb6b03dcf 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_OPENGL_VERTEX_CXX /** - \file opengl_vertex.cxx + \file Fl_OpenGL_Graphics_Driver_vertex.cxx \brief Portable drawing code for drawing arbitrary shapes with simple 2D transformations, implemented for OpenGL. */ diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H index de34ea36a..52b0c9943 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H @@ -18,7 +18,7 @@ // /** - \file quartz.h + \file Fl_Quartz_Graphics_Driver.H \brief Definition of Apple Quartz graphics driver. */ diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx index 32e67a7b2..7186a030a 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx @@ -40,7 +40,7 @@ Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver() return new Fl_Quartz_Graphics_Driver(); } - +#ifndef FL_DOXYGEN Fl_Offscreen Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(int w, int h) { void *data = calloc(w*h,4); CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB(); @@ -48,6 +48,7 @@ Fl_Offscreen Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(int w, int h CGColorSpaceRelease(lut); return (Fl_Offscreen)ctx; } +#endif char Fl_Quartz_Graphics_Driver::can_do_alpha_blending() { return 1; diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx index 4caa5e138..adc1c9362 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx @@ -68,6 +68,7 @@ void Fl_Xlib_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Offs XCopyArea(fl_display, pixmap, fl_window, gc_, srcx, srcy, w, h, x, y); } +#ifndef FL_DOXYGEN void Fl_Xlib_Graphics_Driver::copy_offscreen_with_alpha(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { #if HAVE_XRENDER @@ -95,6 +96,7 @@ void Fl_Xlib_Graphics_Driver::copy_offscreen_with_alpha(int x, int y, int w, int XRenderFreePicture(fl_display, dst); #endif } +#endif // // End of "$Id$". diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx index f20c47d60..ae24fbc84 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx @@ -20,7 +20,7 @@ #include <FL/fl_draw.H> /** - \file xlib_arci.cxx + \file Fl_Xlib_Graphics_Driver_arci.cxx \brief Utility functions for drawing circles using integers */ diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx index 0f47c52e0..012b21f5c 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_XLIB_LINE_STYLE_CXX /** - \file xlib_line_style.cxx + \file Fl_Xlib_Graphics_Driver_line_style.cxx \brief Line style drawing utility hiding different platforms. */ diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx index 371f5eec6..c6ca9b674 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx @@ -22,7 +22,7 @@ /** - \file xlib_rect.cxx + \file Fl_Xlib_Graphics_Driver_rect.cxx \brief X11 Xlib specific line and polygon drawing with integer coordinates. */ diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx index 65516b856..209e688dd 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx @@ -20,7 +20,7 @@ #define FL_CFG_GFX_XLIB_VERTEX_CXX /** - \file xlib_vertex.cxx + \file Fl_Xlib_Graphics_Driver_vertex.cxx \brief Portable drawing code for drawing arbitrary shapes with simple 2D transformations, implemented for X11 Xlib. */ diff --git a/src/screen_xywh.cxx b/src/screen_xywh.cxx index 0b7e91bce..335f457e1 100644 --- a/src/screen_xywh.cxx +++ b/src/screen_xywh.cxx @@ -22,11 +22,12 @@ #include <config.h> +#ifndef FL_DOXYGEN void Fl::call_screen_init() { screen_driver()->init(); } - +#endif /** Returns the leftmost x coordinate of the main screen work area. */ int Fl::x() |