Author: matt
Date: 2011-08-25 15:07:10 -0700 (Thu, 25 Aug 2011)
New Revision: 9013
Log:
Some WIN32 fixes of paths.

Modified:
   branches/branch-3.0/src/fltk3/NativeFileChooser.cxx
   branches/branch-3.0/src/fltk3/dnd.cxx
   branches/branch-3.0/src/fltk3/run.cxx
   branches/branch-3.0/src/fltk3/scandir.cxx
   branches/branch-3.0/src/fltk3/win32.cxx
   branches/branch-3.0/src/fltk3/win32NativeFileChooser.cxx
   branches/branch-3.0/src/fltk3/win32_color.cxx
   branches/branch-3.0/src/fltk3gl/GLChoice.h

Modified: branches/branch-3.0/src/fltk3/NativeFileChooser.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/NativeFileChooser.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/NativeFileChooser.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -27,7 +27,7 @@
 
 // Use Windows' chooser
 #ifdef WIN32
-#include "Fl_Native_File_Chooser_WIN32.cxx"
+#include "win32NativeFileChooser.cxx"
 #endif
 
 // Use Apple's chooser
@@ -37,7 +37,7 @@
 
 // All else falls back to FLTK's own chooser
 #if ! defined(__APPLE__) && !defined(WIN32)
-#include "Fl_Native_File_Chooser_FLTK.cxx"
+#include "x11NativeFileChooser.cxx"
 #endif
 
 const char *fltk3::NativeFileChooser::file_exists_message = "File exists. Are you sure you want to overwrite?";

Modified: branches/branch-3.0/src/fltk3/dnd.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/dnd.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/dnd.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -26,11 +26,11 @@
 //
 
 #ifdef WIN32
-#  include "fl_dnd_win32.cxx"
+#  include "win32_dnd.cxx"
 #elif defined(__APPLE__)
 //#  include "fl_dnd_mac.cxx"
 #else
-#  include "fl_dnd_x.cxx"
+#  include "x11_dnd.cxx"
 #endif
 
 //

Modified: branches/branch-3.0/src/fltk3/run.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/run.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/run.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -1710,7 +1710,7 @@
 }
 
 #ifdef WIN32
-#  include "Fl_win32.cxx"
+#  include "win32.cxx"
 //#elif defined(__APPLE__)
 #endif
 

Modified: branches/branch-3.0/src/fltk3/scandir.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/scandir.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/scandir.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -17,7 +17,7 @@
 USA.  */
 
 #if defined(WIN32) && !defined(__CYGWIN__)
-#  include "scandir_win32.cxx"
+#  include "win32_scandir.cxx"
 #else
 
 #  include "flstring.h"

Modified: branches/branch-3.0/src/fltk3/win32.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/win32.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -40,7 +40,7 @@
 #include <fltk3/Tooltip.h>
 #include <fltk3/PagedDevice.h>
 #include "flstring.h"
-#include "Fl_Font.H"
+#include "font.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>

Modified: branches/branch-3.0/src/fltk3/win32NativeFileChooser.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32NativeFileChooser.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/win32NativeFileChooser.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -34,7 +34,7 @@
 
 #include <stdio.h>		// debugging
 #include <wchar.h>		//MG
-#include "Fl_Native_File_Chooser_common.cxx"		// strnew/strfree/strapp/chrcat
+#include "NativeFileChooser_common.cxx"		// strnew/strfree/strapp/chrcat
 typedef const wchar_t *LPCWSTR; //MG
 LPCWSTR utf8towchar(const char *in); //MG
 char *wchartoutf8(LPCWSTR in);  //MG

Modified: branches/branch-3.0/src/fltk3/win32_color.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32_color.cxx	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3/win32_color.cxx	2011-08-25 22:07:10 UTC (rev 9013)
@@ -40,7 +40,7 @@
 #include <fltk3/draw.h>
 
 static unsigned fl_cmap[256] = {
-#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
+#include "cmap.h" // this is a file produced by "cmap.cxx":
 };
 
 // Translations to win32 data structures:

Modified: branches/branch-3.0/src/fltk3gl/GLChoice.h
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLChoice.h	2011-08-25 22:05:10 UTC (rev 9012)
+++ branches/branch-3.0/src/fltk3gl/GLChoice.h	2011-08-25 22:07:10 UTC (rev 9013)
@@ -57,7 +57,7 @@
 // Warning: whatever GLContext is defined to must take exactly the same
 // space in a structure as a void*!!!
 #ifdef WIN32
-#  include <fltk3/gl.h>
+#  include <fltk3gl/gl.h>
 #  define GLContext HGLRC
 #elif defined(__APPLE_QUARTZ__)
 // warning: the Quartz version should probably use Core GL (CGL) instead of AGL