Author: manolo
Date: 2012-03-17 01:58:58 -0700 (Sat, 17 Mar 2012)
New Revision: 9288
Log:
Function virtual int fltk3::SurfaceDevice::has_display_driver() is set private.
Modified:
branches/branch-3.0/include/fltk3/Device.h
branches/branch-3.0/include/fltk3/Printer.h
branches/branch-3.0/src/fltk3/Device.cxx
Modified: branches/branch-3.0/include/fltk3/Device.h
===================================================================
--- branches/branch-3.0/include/fltk3/Device.h 2012-03-16 17:27:45 UTC (rev
9287)
+++ branches/branch-3.0/include/fltk3/Device.h 2012-03-17 08:58:58 UTC (rev
9288)
@@ -509,6 +509,7 @@
/** \brief The graphics driver in use by this surface. */
fltk3::GraphicsDriver *_driver;
static SurfaceDevice *_surface; // the surface that currently receives
graphics output
+ virtual int has_display_driver();
protected:
/** \brief Constructor that sets the graphics driver to use for the
created surface. */
SurfaceDevice(fltk3::GraphicsDriver *graphics_driver) {_driver =
graphics_driver; };
@@ -521,7 +522,6 @@
/** \brief the surface that currently receives graphics output */
static inline fltk3::SurfaceDevice *surface() {return _surface; };
static int to_display();
- virtual int has_display_driver();
/** returns true if the current output surface uses the same graphics
driver
as the platform display, and false otherwise */
static inline int uses_display_driver() { return
fltk3::SurfaceDevice::surface()->has_display_driver(); };
@@ -534,12 +534,12 @@
*/
class FLTK3_EXPORT DisplayDevice : public fltk3::SurfaceDevice {
static DisplayDevice *_display; // the platform display device
+ int has_display_driver();
public:
/** \brief A constructor that sets the graphics driver used by the display
*/
DisplayDevice(fltk3::GraphicsDriver *graphics_driver);
/** Returns the platform display device. */
static inline DisplayDevice *display_device() {return _display;};
- int has_display_driver();
};
/**
Modified: branches/branch-3.0/include/fltk3/Printer.h
===================================================================
--- branches/branch-3.0/include/fltk3/Printer.h 2012-03-16 17:27:45 UTC (rev
9287)
+++ branches/branch-3.0/include/fltk3/Printer.h 2012-03-17 08:58:58 UTC (rev
9288)
@@ -77,6 +77,7 @@
int top_margin;
void absolute_printable_rect(int *x, int *y, int *w, int *h);
#endif
+ int has_display_driver();
protected:
/** \brief The constructor */
SystemPrinter(void);
@@ -93,7 +94,6 @@
void untranslate(void);
int end_page (void);
void end_job (void);
- int has_display_driver();
/** \brief The destructor */
~SystemPrinter(void);
}; // class fltk3::SystemPrinter
Modified: branches/branch-3.0/src/fltk3/Device.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Device.cxx 2012-03-16 17:27:45 UTC (rev
9287)
+++ branches/branch-3.0/src/fltk3/Device.cxx 2012-03-17 08:58:58 UTC (rev
9288)
@@ -46,8 +46,7 @@
return fltk3::SurfaceDevice::surface() ==
fltk3::DisplayDevice::display_device();
}
-/** returns true if this surface uses the same graphics driver
- as the platform display, and false otherwise */
+// returns whether this surface uses the same graphics driver as the platform
display
int fltk3::SurfaceDevice::has_display_driver() {
return 0;
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
