1) Added a new way to detect whether the drawing operation is using the platform's native driver

and whether we are printing:  virtual int Fl_Graphics_Driver::has_feature(driver_feature feature)
This is also because it is not convenient to derive a printer-specific driver with its own
implementation of virtual functions when this implementation differs only in one line of code.

2) Solved the problem of inclusion of non public header by the public header FL/Fl_Device.H:
bracket this with #if FL_LIBRARY / #endif so this non public header is included only when building
FLTK itself.

3) Removed several (but not all) of the FLTK_ABI_VERSION guards that are no longer
useful for code targeting FLTK 1.4.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11063 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 0 insertions, 25 deletions

diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H
index 135f0399c..0bf4b11ab 100644
--- a/FL/Fl_Native_File_Chooser.H
+++ b/FL/Fl_Native_File_Chooser.H
@@ -27,16 +27,8 @@
 #ifdef WIN32
 
 // #define _WIN32_WINNT	0x0501	// needed for OPENFILENAME's 'FlagsEx'
-#if defined(FL_LIBRARY) || FLTK_ABI_VERSION < 10304
-#  include <windows.h>
-#  include <commdlg.h>		// OPENFILENAMEW, GetOpenFileName()
-#  include <shlobj.h>		// BROWSEINFOW, SHBrowseForFolder()
-typedef OPENFILENAMEW fl_OPENFILENAMEW;
-typedef BROWSEINFOW fl_BROWSEINFOW;
-#else
 typedef void fl_OPENFILENAMEW;
 typedef void fl_BROWSEINFOW;
-#endif
 #  include <FL/filename.H>	// FL_EXPORT
 
 // Use Apple's chooser
@@ -162,13 +154,8 @@ public:
 private:
   int  _btype;			// kind-of browser to show()
   int  _options;		// general options
-#if FLTK_ABI_VERSION >= 10304
   fl_OPENFILENAMEW *_ofn_ptr;		// GetOpenFileName() & GetSaveFileName() struct
   fl_BROWSEINFOW   *_binf_ptr;		// SHBrowseForFolder() struct
-#else
-  fl_OPENFILENAMEW _ofn;
-  fl_BROWSEINFOW   _binf;
-#endif
   char  **_pathnames;		// array of pathnames
   int     _tpathnames;		// total pathnames
   char   *_directory;		// default pathname to use
@@ -240,18 +227,6 @@ private:
 #else
 
 private:
-#if FLTK_ABI_VERSION <= 10302
-  int   _btype;			// kind-of browser to show()
-  int   _options;		// general options
-  int   _nfilters;
-  char *_filter;		// user supplied filter
-  char *_parsedfilt;		// parsed filter
-  int   _filtvalue;		// selected filter
-  char *_preset_file;
-  char *_prevvalue;		// Returned filename
-  char *_directory;
-  char *_errmsg;		// error message
-#endif
   static int have_looked_for_GTK_libs;
   union {
     Fl_FLTK_File_Chooser *_x11_file_chooser;