[Library] r9010 - in branches/branch-3.0: . fluid ide/VisualC2008 ide/VisualC2010 ide/VisualC6 ide/Xcode4/FLTK.xcodeproj include/fltk3 include/fltk3gl src src/core src/fltk3gl test

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[Library] r9010 - in branches/branch-3.0: . fluid ide/VisualC2008 ide/VisualC2010 ide/VisualC6 ide/Xcode4/FLTK.xcodeproj include/fltk3 include/fltk3gl src src/core src/fltk3gl test fltk-dev Aug 25, 2011 top right image
 
Author: matt
Date: 2011-08-25 04:40:26 -0700 (Thu, 25 Aug 2011)
New Revision: 9010
Log:
Final(?) OpenGL renaming.

Added:
   branches/branch-3.0/include/fltk3gl/GLWindow.h
   branches/branch-3.0/src/fltk3gl/GLChoice.cxx
   branches/branch-3.0/src/fltk3gl/GLChoice.h
   branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx
   branches/branch-3.0/src/fltk3gl/GLOverlay.cxx
   branches/branch-3.0/src/fltk3gl/GLWindow.cxx
   branches/branch-3.0/src/fltk3gl/freeglut_teapot_data.h
Removed:
   branches/branch-3.0/include/fltk3gl/GL_Window.h
   branches/branch-3.0/include/fltk3gl/gl2opengl.h
   branches/branch-3.0/src/core/freeglut_teapot_data.h
   branches/branch-3.0/src/fltk3gl/GL_Choice.cxx
   branches/branch-3.0/src/fltk3gl/GL_Choice.h
   branches/branch-3.0/src/fltk3gl/GL_DevicePlugin.cxx
   branches/branch-3.0/src/fltk3gl/GL_Overlay.cxx
   branches/branch-3.0/src/fltk3gl/GL_Window.cxx
Modified:
   branches/branch-3.0/fltk.flw
   branches/branch-3.0/fluid/Fl_Widget_Type.cxx
   branches/branch-3.0/fluid/Fluid_Image.cxx
   branches/branch-3.0/fluid/file_cmake.cxx
   branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj
   branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj
   branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj
   branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj
   branches/branch-3.0/ide/VisualC6/fltk3.dsp
   branches/branch-3.0/ide/VisualC6/fltk3gl.dsp
   branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp
   branches/branch-3.0/ide/VisualC6/fltk3png.dsp
   branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp
   branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
   branches/branch-3.0/include/fltk3/Printer.h
   branches/branch-3.0/include/fltk3/Widget.h
   branches/branch-3.0/include/fltk3/Window.h
   branches/branch-3.0/include/fltk3/enumerations.h
   branches/branch-3.0/include/fltk3/run.h
   branches/branch-3.0/include/fltk3gl/all.h
   branches/branch-3.0/include/fltk3gl/gl.h
   branches/branch-3.0/include/fltk3gl/glu.h
   branches/branch-3.0/include/fltk3gl/glut.h
   branches/branch-3.0/src/CMakeLists.txt
   branches/branch-3.0/src/Makefile
   branches/branch-3.0/src/core/Fl_cocoa.mm
   branches/branch-3.0/src/fltk3gl/freeglut_geometry.cxx
   branches/branch-3.0/src/fltk3gl/freeglut_stroke_mono_roman.cxx
   branches/branch-3.0/src/fltk3gl/freeglut_stroke_roman.cxx
   branches/branch-3.0/src/fltk3gl/freeglut_teapot.cxx
   branches/branch-3.0/src/makedepend
   branches/branch-3.0/test/CubeView.cxx
   branches/branch-3.0/test/CubeView.h
   branches/branch-3.0/test/cube.cxx
   branches/branch-3.0/test/demo.cxx
   branches/branch-3.0/test/demo.menu
   branches/branch-3.0/test/fractals.cxx
   branches/branch-3.0/test/fracviewer.cxx
   branches/branch-3.0/test/fullscreen.cxx
   branches/branch-3.0/test/gl_overlay.cxx
   branches/branch-3.0/test/glpuzzle.cxx
   branches/branch-3.0/test/makedepend
   branches/branch-3.0/test/shape.cxx

Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/fltk.flw	2011-08-25 11:40:26 UTC (rev 9010)
@@ -2,7 +2,7 @@
 version 3.0000 
 header_name {.h} 
 code_name {.cxx}
-workspace FLTK {open
+workspace FLTK {open selected
   uuid_Xcode4_Root {2204C862-3EAB-44CD-B0A8-6DF16FFDC8F4}
   uuid_Xcode4_ProductsGroup {A3B55F76-F5F9-4F9E-8A45-2778583213A1}
   uuid_Xcode4_Group {341D2CD3-06FB-47E4-B35C-D1F9B51C7293}
@@ -14,10 +14,10 @@
   uuid_VC2010_Workspace {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
   build_env 64
 } {
-  folder Applications {open
+  folder Applications {
     uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
   } {
-    app_target Fluid {open
+    app_target Fluid {
       uuid_Xcode4_ProductReference {FD9750B2-CA9C-4856-A516-E56BD9B2E805}
       uuid_Xcode4_ProductFileReference {4616D958-4FAE-4BE9-921B-A868F80B6CC7}
       uuid_Xcode4_FluidBuildRule {30FE3F00-9876-4AE4-9F6E-35B6B4CAA24E}
@@ -633,54 +633,6 @@
           list_env 124
           filename_and_path {include/fltk3/GIFImage.h}
         }
-        file_ref {gl.h} {
-          uuid_Xcode4_BuildFile {171AF659-2712-45E4-917F-0971FA2C1040}
-          uuid_Xcode4_FileRef {AA155A86-0B3D-4238-A705-B8E83B16258B}
-          uuid_Xcode4_BuildFileInHeaders {53065D00-00D5-4F2D-B6B0-0238CFA68C55}
-          build_env 96
-          list_env 124
-          filename_and_path {include/fltk3/gl.h}
-        }
-        file_ref {gl2opengl.h} {
-          uuid_Xcode4_BuildFile {A18A80EF-C434-4B35-BE46-702905667C1D}
-          uuid_Xcode4_FileRef {6AC61280-F875-42D8-9A44-087A036E896A}
-          uuid_Xcode4_BuildFileInHeaders {72812FEB-26EE-488F-9EEC-B4ED02F3DE4D}
-          build_env 96
-          list_env 124
-          filename_and_path {include/fltk3/gl2opengl.h}
-        }
-        file_ref {glDraw.h} {
-          uuid_Xcode4_BuildFile {0CE51E55-FA96-44E7-B2E8-67DD96F3C30C}
-          uuid_Xcode4_FileRef {B1017553-3892-425D-AD7B-921D27DF6DB1}
-          uuid_Xcode4_BuildFileInHeaders {48257DCA-61D9-4813-AF09-08C1AA38665E}
-          build_env 96
-          list_env 124
-          filename_and_path {include/fltk3/glDraw.h}
-        }
-        file_ref {glu.h} {
-          uuid_Xcode4_BuildFile {E5E7BD83-9048-4F70-B075-3AEBA4E431F3}
-          uuid_Xcode4_FileRef {853E4A1D-B602-42DC-8BBD-FAA73C103971}
-          uuid_Xcode4_BuildFileInHeaders {4DB7B8EB-64B3-4C69-9F0A-88278049A0C9}
-          build_env 96
-          list_env 124
-          filename_and_path {include/fltk3/glu.h}
-        }
-        file_ref {glut.h} {
-          uuid_Xcode4_BuildFile {8AB70A97-595C-4E23-B623-688B0FF2BCE4}
-          uuid_Xcode4_FileRef {D910C663-E83B-40C8-B04C-A74F18F324D9}
-          uuid_Xcode4_BuildFileInHeaders {665EED20-74C2-4B26-A298-617066EA7551}
-          build_env 96
-          list_env 124
-          filename_and_path {include/fltk3/glut.h}
-        }
-        file_ref {GlWindow.h} {
-          uuid_Xcode4_BuildFile {8949C41C-2C1C-4C70-B1D1-CD2E7FF04607}
-          uuid_Xcode4_FileRef {F9673F32-154D-455D-9944-259374A4A13D}
-          uuid_Xcode4_BuildFileInHeaders {7A5AD5C3-4B24-4558-AD62-1B5C2E02E9F8}
-          build_env 96
-          list_env 124
-          filename_and_path {include/fltk3/GlWindow.h}
-        }
         file_ref {Group.h} {
           uuid_Xcode4_BuildFile {2D46FE73-1213-4993-9C58-3AD4F912D0F1}
           uuid_Xcode4_FileRef {91EA0376-23A2-4777-B42C-16F89603F364}
@@ -1498,7 +1450,7 @@
           filename_and_path {include/fltk3/Xutf8.h}
         }
       }
-      folder Sources {open
+      folder Sources {
         uuid_Xcode4_Group {91990322-0AF9-42F2-A077-713540EE5AB1}
       } {
         file_ref {Fl_cocoa.mm} {
@@ -1525,7 +1477,7 @@
           list_env 96
           filename_and_path {src/core/Fl_Quartz_Printer.mm}
         }
-        file_ref {run.cxx} {selected
+        file_ref {run.cxx} {
           uuid_Xcode4_BuildFile {5E78E80A-9D1C-4351-9F3E-B2944D622982}
           uuid_Xcode4_FileRef {81045D02-0D89-472C-BAE7-D77BD81C23A2}
           uuid_Xcode4_BuildFileInSources {008DDC0F-78E3-4A40-8F42-9408DA34594C}
@@ -2468,7 +2420,7 @@
         }
       }
     }
-    lib_target fltk3gl {
+    lib_target fltk3gl {open
       uuid_Xcode4_FluidBuildRule {C15C877E-5712-4AB2-B7BE-7B8A5F1D6F49}
       uuid_Xcode4_ProductFileReference {47405B55-C42D-4839-B6BF-F6B5BA410AF3}
       uuid_Xcode4_FrameworksBuildPhase {A02CA389-C019-4CB2-82B7-1CC18C255A72}
@@ -2485,63 +2437,128 @@
       target_path lib
       makefile_path src
     } {
-      folder Sources {
+      folder Headers {open
+        uuid_Xcode4_Group {C95C7D1D-26EB-4733-85B0-948B0374F9C7}
+      } {
+        file_ref {all.h} {
+          uuid_Xcode4_BuildFile {7D7EA0F0-238C-43DF-BC9E-2E75545A7561}
+          uuid_Xcode4_FileRef {CED79020-45B9-48AF-8CCD-2ACD47341619}
+          uuid_Xcode4_BuildFileInHeaders {B7A25ADB-643D-4390-A61A-68164BC87FF4}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/all.h}
+        }
+        file_ref {fltk3gl.h} {
+          uuid_Xcode4_BuildFile {0B3436B4-295C-420F-BF1E-4F44384233C1}
+          uuid_Xcode4_FileRef {53A9932F-79EC-4FD5-A004-1770F7BAEE86}
+          uuid_Xcode4_BuildFileInHeaders {EBA51047-3BA1-4441-ABEC-08012E3A2A19}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/fltk3gl.h}
+        }
+        file_ref {gl.h} {
+          uuid_Xcode4_BuildFile {171AF659-2712-45E4-917F-0971FA2C1040}
+          uuid_Xcode4_FileRef {AA155A86-0B3D-4238-A705-B8E83B16258B}
+          uuid_Xcode4_BuildFileInHeaders {53065D00-00D5-4F2D-B6B0-0238CFA68C55}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/gl.h}
+        }
+        file_ref {glDraw.h} {
+          uuid_Xcode4_BuildFile {0CE51E55-FA96-44E7-B2E8-67DD96F3C30C}
+          uuid_Xcode4_FileRef {B1017553-3892-425D-AD7B-921D27DF6DB1}
+          uuid_Xcode4_BuildFileInHeaders {48257DCA-61D9-4813-AF09-08C1AA38665E}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/glDraw.h}
+        }
+        file_ref {glu.h} {
+          uuid_Xcode4_BuildFile {E5E7BD83-9048-4F70-B075-3AEBA4E431F3}
+          uuid_Xcode4_FileRef {853E4A1D-B602-42DC-8BBD-FAA73C103971}
+          uuid_Xcode4_BuildFileInHeaders {4DB7B8EB-64B3-4C69-9F0A-88278049A0C9}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/glu.h}
+        }
+        file_ref {glut.h} {
+          uuid_Xcode4_BuildFile {8AB70A97-595C-4E23-B623-688B0FF2BCE4}
+          uuid_Xcode4_FileRef {D910C663-E83B-40C8-B04C-A74F18F324D9}
+          uuid_Xcode4_BuildFileInHeaders {665EED20-74C2-4B26-A298-617066EA7551}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/glut.h}
+        }
+        file_ref {GLWindow.h} {
+          uuid_Xcode4_BuildFile {8949C41C-2C1C-4C70-B1D1-CD2E7FF04607}
+          uuid_Xcode4_FileRef {F9673F32-154D-455D-9944-259374A4A13D}
+          uuid_Xcode4_BuildFileInHeaders {7A5AD5C3-4B24-4558-AD62-1B5C2E02E9F8}
+          build_env 96
+          list_env 124
+          filename_and_path {include/fltk3gl/GLWindow.h}
+        }
+      }
+      folder Sources {open
         uuid_Xcode4_Group {AF239AB5-D7A8-4916-B8FD-AB46E12676A0}
       } {
-        file_ref {Fl_Gl_Choice.cxx} {
+        file_ref {GLChoice.cxx} {
           uuid_Xcode4_BuildFileInSources {E1C77AA3-F9A7-4CE9-8892-06DA277C3538}
           uuid_Xcode4_FileRef {DE5C107D-166F-42F2-9042-0A08FBEF3B60}
-          filename_and_path {src/core/Fl_Gl_Choice.cxx}
+          filename_and_path {src/fltk3gl/GLChoice.cxx}
         }
-        file_ref {Fl_Gl_Device_Plugin.cxx} {
+        file_ref {GLDevicePlugin.cxx} {
           uuid_Xcode4_BuildFileInSources {E8D5789A-7A69-45A6-9900-2123CBE99BDE}
           uuid_Xcode4_FileRef {391E3B0B-3499-46A4-B0FC-8BA7EC865531}
-          filename_and_path {src/core/Fl_Gl_Device_Plugin.cxx}
+          filename_and_path {src/fltk3gl/GLDevicePlugin.cxx}
         }
-        file_ref {Fl_Gl_Overlay.cxx} {
+        file_ref {GLOverlay.cxx} {
           uuid_Xcode4_BuildFileInSources {070BED62-ED38-45D1-BDFE-569E9EBED411}
           uuid_Xcode4_FileRef {07BC5E29-F3DD-4EF8-A362-BEB97204BFDA}
-          filename_and_path {src/core/Fl_Gl_Overlay.cxx}
+          filename_and_path {src/fltk3gl/GLOverlay.cxx}
         }
-        file_ref {Fl_Gl_Window.cxx} {
+        file_ref {GLWindow.cxx} {
           uuid_Xcode4_BuildFileInSources {32BC3E68-841A-4283-B00D-A5EB305FD0AA}
           uuid_Xcode4_FileRef {53DC629E-53C3-498E-91AD-57A275B5DB21}
-          filename_and_path {src/core/Fl_Gl_Window.cxx}
+          filename_and_path {src/fltk3gl/GLWindow.cxx}
         }
         file_ref {freeglut_geometry.cxx} {
           uuid_Xcode4_BuildFileInSources {ECB8D856-36CB-46A6-91F6-208478C0CBF3}
           uuid_Xcode4_FileRef {FFAAC078-4DCA-4EEE-926B-22E2398B7046}
-          filename_and_path {src/core/freeglut_geometry.cxx}
+          filename_and_path {src/fltk3gl/freeglut_geometry.cxx}
         }
         file_ref {freeglut_stroke_mono_roman.cxx} {
           uuid_Xcode4_BuildFileInSources {75788B42-B62E-4C4F-9E61-4B91C7324344}
           uuid_Xcode4_FileRef {504FF704-8B78-42E2-BB35-33253373D40F}
-          filename_and_path {src/core/freeglut_stroke_mono_roman.cxx}
+          filename_and_path {src/fltk3gl/freeglut_stroke_mono_roman.cxx}
         }
         file_ref {freeglut_stroke_roman.cxx} {
           uuid_Xcode4_BuildFileInSources {9CDFF782-50BD-4118-B043-8B22A9B2F2CC}
           uuid_Xcode4_FileRef {B2D08460-836E-4E9C-A77B-DBD6C1A1A460}
-          filename_and_path {src/core/freeglut_stroke_roman.cxx}
+          filename_and_path {src/fltk3gl/freeglut_stroke_roman.cxx}
         }
         file_ref {freeglut_teapot.cxx} {
           uuid_Xcode4_BuildFileInSources {CE3D60CB-29C8-424A-91AA-1742E2155791}
           uuid_Xcode4_FileRef {9F61A674-BE2D-4567-9B0F-B0A7A83F337A}
-          filename_and_path {src/core/freeglut_teapot.cxx}
+          filename_and_path {src/fltk3gl/freeglut_teapot.cxx}
         }
         file_ref {gl_draw.cxx} {
           uuid_Xcode4_BuildFileInSources {008A289F-3FCA-4E5D-9F9D-A6601947D877}
           uuid_Xcode4_FileRef {CBE8D5E4-01A5-438B-B144-4FFA652AE41A}
-          filename_and_path {src/core/gl_draw.cxx}
+          filename_and_path {src/fltk3gl/gl_draw.cxx}
         }
+        file_ref {gl_start.cxx} {
+          uuid_Xcode4_BuildFileInSources {DED2BAE9-D7AB-43CB-ADFA-DCC2073A5321}
+          uuid_Xcode4_FileRef {EC3E5EA3-09BC-42DA-97C6-42B836F8BDA2}
+          filename_and_path {src/fltk3gl/gl_start.cxx}
+        }
         file_ref {glut_compatability.cxx} {
           uuid_Xcode4_BuildFileInSources {4432E2FF-063E-407F-B040-F7168FACEC8A}
           uuid_Xcode4_FileRef {7458D589-B1BE-4EFD-8D40-E5B8F83EDDDE}
-          filename_and_path {src/core/glut_compatability.cxx}
+          filename_and_path {src/fltk3gl/glut_compatability.cxx}
         }
         file_ref {glut_font.cxx} {
           uuid_Xcode4_BuildFileInSources {52743D1F-C453-4A9C-B7FF-24D5110D8886}
           uuid_Xcode4_FileRef {8A51D2BA-6224-4A81-A7C0-1FF09F60F380}
-          filename_and_path {src/core/glut_font.cxx}
+          filename_and_path {src/fltk3gl/glut_font.cxx}
         }
       }
       folder Libraries {open

Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -1960,6 +1960,7 @@
 void Fl_Widget_Type::write_static() {
   const char* t = subclassname(this);
   if (!subclass() || (is_class() && !strncmp(t, "fltk3::", 7))) {
+    // FIXME: this will not work for fltk3gl and fltk3images any more!
     write_declare("#include <fltk3/%s.h>", t+7);
   }
   for (int n=0; n < NUM_EXTRA_CODE; n++) {

Modified: branches/branch-3.0/fluid/Fluid_Image.cxx
===================================================================
--- branches/branch-3.0/fluid/Fluid_Image.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/fluid/Fluid_Image.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -57,6 +57,7 @@
     // Write Pixmap data...
     write_c("\n");
     if (pixmap_header_written != write_number) {
+      // FIXME: this will have to be fltk3image/...
       write_c("#include <fltk3/Pixmap.h>\n");
       pixmap_header_written = write_number;
     }

Modified: branches/branch-3.0/fluid/file_cmake.cxx
===================================================================
--- branches/branch-3.0/fluid/file_cmake.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/fluid/file_cmake.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -41,6 +41,11 @@
 extern const char *filename;
 
 int write_fltk_cmake() {
+  
+  // FIXME: re-add CMake support later!
+  return 0;
+  
+  
   // for now, we use a template file in FLTK/ide/templates/CMake.tmpl .
   // When done, everything will likely be integrated into the executable to make one compact package.
   char buf[2048], base_dir[2048], tgt_base[2048];

Modified: branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3.vcproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2008/fltk3.vcproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -161,7 +161,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\core\Fl.cxx"
+			RelativePath="..\..\src\fltk3\run.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

Modified: branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -161,7 +161,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\core\Fl_Gl_Choice.cxx"
+			RelativePath="..\..\src\fltk3gl\GLChoice.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -184,7 +184,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\Fl_Gl_Device_Plugin.cxx"
+			RelativePath="..\..\src\fltk3gl\GLDevicePlugin.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -207,7 +207,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\Fl_Gl_Overlay.cxx"
+			RelativePath="..\..\src\fltk3gl\GLOverlay.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -230,7 +230,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\Fl_Gl_Window.cxx"
+			RelativePath="..\..\src\fltk3gl\GLWindow.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -253,7 +253,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\freeglut_geometry.cxx"
+			RelativePath="..\..\src\fltk3gl\freeglut_geometry.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -276,7 +276,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\freeglut_stroke_mono_roman.cxx"
+			RelativePath="..\..\src\fltk3gl\freeglut_stroke_mono_roman.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -299,7 +299,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\freeglut_stroke_roman.cxx"
+			RelativePath="..\..\src\fltk3gl\freeglut_stroke_roman.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -322,7 +322,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\freeglut_teapot.cxx"
+			RelativePath="..\..\src\fltk3gl\freeglut_teapot.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -345,7 +345,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\gl_draw.cxx"
+			RelativePath="..\..\src\fltk3gl\gl_draw.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -368,7 +368,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\glut_compatability.cxx"
+			RelativePath="..\..\src\fltk3gl\gl_start.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -391,7 +391,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\core\glut_font.cxx"
+			RelativePath="..\..\src\fltk3gl\glut_compatability.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -413,6 +413,29 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\..\src\fltk3gl\glut_font.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Modified: branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -161,7 +161,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\jpeg\jaricom.c"
+			RelativePath="..\..\src\fltk3jpeg\jaricom.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -184,7 +184,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcarith.c"
+			RelativePath="..\..\src\fltk3jpeg\jcarith.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -207,7 +207,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdarith.c"
+			RelativePath="..\..\src\fltk3jpeg\jdarith.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -230,7 +230,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcapimin.c"
+			RelativePath="..\..\src\fltk3jpeg\jcapimin.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -253,7 +253,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcapistd.c"
+			RelativePath="..\..\src\fltk3jpeg\jcapistd.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -276,7 +276,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jccoefct.c"
+			RelativePath="..\..\src\fltk3jpeg\jccoefct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -299,7 +299,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jccolor.c"
+			RelativePath="..\..\src\fltk3jpeg\jccolor.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -322,7 +322,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcdctmgr.c"
+			RelativePath="..\..\src\fltk3jpeg\jcdctmgr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -345,7 +345,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jchuff.c"
+			RelativePath="..\..\src\fltk3jpeg\jchuff.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -368,7 +368,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcinit.c"
+			RelativePath="..\..\src\fltk3jpeg\jcinit.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -391,7 +391,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcmainct.c"
+			RelativePath="..\..\src\fltk3jpeg\jcmainct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -414,7 +414,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcmarker.c"
+			RelativePath="..\..\src\fltk3jpeg\jcmarker.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -437,7 +437,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcmaster.c"
+			RelativePath="..\..\src\fltk3jpeg\jcmaster.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -460,7 +460,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcomapi.c"
+			RelativePath="..\..\src\fltk3jpeg\jcomapi.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -483,7 +483,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcparam.c"
+			RelativePath="..\..\src\fltk3jpeg\jcparam.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -506,7 +506,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcprepct.c"
+			RelativePath="..\..\src\fltk3jpeg\jcprepct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -529,7 +529,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jcsample.c"
+			RelativePath="..\..\src\fltk3jpeg\jcsample.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -552,7 +552,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jctrans.c"
+			RelativePath="..\..\src\fltk3jpeg\jctrans.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -575,7 +575,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdapimin.c"
+			RelativePath="..\..\src\fltk3jpeg\jdapimin.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -598,7 +598,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdapistd.c"
+			RelativePath="..\..\src\fltk3jpeg\jdapistd.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -621,7 +621,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdatadst.c"
+			RelativePath="..\..\src\fltk3jpeg\jdatadst.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -644,7 +644,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdatasrc.c"
+			RelativePath="..\..\src\fltk3jpeg\jdatasrc.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -667,7 +667,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdcoefct.c"
+			RelativePath="..\..\src\fltk3jpeg\jdcoefct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -690,7 +690,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdcolor.c"
+			RelativePath="..\..\src\fltk3jpeg\jdcolor.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -713,7 +713,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jddctmgr.c"
+			RelativePath="..\..\src\fltk3jpeg\jddctmgr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -736,7 +736,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdhuff.c"
+			RelativePath="..\..\src\fltk3jpeg\jdhuff.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -759,7 +759,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdinput.c"
+			RelativePath="..\..\src\fltk3jpeg\jdinput.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -782,7 +782,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdmainct.c"
+			RelativePath="..\..\src\fltk3jpeg\jdmainct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -805,7 +805,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdmarker.c"
+			RelativePath="..\..\src\fltk3jpeg\jdmarker.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -828,7 +828,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdmaster.c"
+			RelativePath="..\..\src\fltk3jpeg\jdmaster.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -851,7 +851,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdmerge.c"
+			RelativePath="..\..\src\fltk3jpeg\jdmerge.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -874,7 +874,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdpostct.c"
+			RelativePath="..\..\src\fltk3jpeg\jdpostct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -897,7 +897,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdsample.c"
+			RelativePath="..\..\src\fltk3jpeg\jdsample.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -920,7 +920,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jdtrans.c"
+			RelativePath="..\..\src\fltk3jpeg\jdtrans.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -943,7 +943,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jerror.c"
+			RelativePath="..\..\src\fltk3jpeg\jerror.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -966,7 +966,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jfdctflt.c"
+			RelativePath="..\..\src\fltk3jpeg\jfdctflt.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -989,7 +989,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jfdctfst.c"
+			RelativePath="..\..\src\fltk3jpeg\jfdctfst.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1012,7 +1012,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jfdctint.c"
+			RelativePath="..\..\src\fltk3jpeg\jfdctint.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1035,7 +1035,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jidctflt.c"
+			RelativePath="..\..\src\fltk3jpeg\jidctflt.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1058,7 +1058,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jidctfst.c"
+			RelativePath="..\..\src\fltk3jpeg\jidctfst.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1081,7 +1081,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jidctint.c"
+			RelativePath="..\..\src\fltk3jpeg\jidctint.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1104,7 +1104,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jmemmgr.c"
+			RelativePath="..\..\src\fltk3jpeg\jmemmgr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1127,7 +1127,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jmemnobs.c"
+			RelativePath="..\..\src\fltk3jpeg\jmemnobs.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1150,7 +1150,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jquant1.c"
+			RelativePath="..\..\src\fltk3jpeg\jquant1.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1173,7 +1173,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jquant2.c"
+			RelativePath="..\..\src\fltk3jpeg\jquant2.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1196,7 +1196,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\jpeg\jutils.c"
+			RelativePath="..\..\src\fltk3jpeg\jutils.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

Modified: branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -161,7 +161,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\png\png.c"
+			RelativePath="..\..\src\fltk3png\png.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -184,7 +184,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngerror.c"
+			RelativePath="..\..\src\fltk3png\pngerror.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -207,7 +207,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngget.c"
+			RelativePath="..\..\src\fltk3png\pngget.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -230,7 +230,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngmem.c"
+			RelativePath="..\..\src\fltk3png\pngmem.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -253,7 +253,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngpread.c"
+			RelativePath="..\..\src\fltk3png\pngpread.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -276,7 +276,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngread.c"
+			RelativePath="..\..\src\fltk3png\pngread.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -299,7 +299,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngrio.c"
+			RelativePath="..\..\src\fltk3png\pngrio.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -322,7 +322,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngrtran.c"
+			RelativePath="..\..\src\fltk3png\pngrtran.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -345,7 +345,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngrutil.c"
+			RelativePath="..\..\src\fltk3png\pngrutil.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -368,7 +368,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngset.c"
+			RelativePath="..\..\src\fltk3png\pngset.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -391,7 +391,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngtrans.c"
+			RelativePath="..\..\src\fltk3png\pngtrans.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -414,7 +414,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngwio.c"
+			RelativePath="..\..\src\fltk3png\pngwio.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -437,7 +437,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngwrite.c"
+			RelativePath="..\..\src\fltk3png\pngwrite.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -460,7 +460,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngwtran.c"
+			RelativePath="..\..\src\fltk3png\pngwtran.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -483,7 +483,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\png\pngwutil.c"
+			RelativePath="..\..\src\fltk3png\pngwutil.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

Modified: branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -161,7 +161,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\src\zlib\adler32.c"
+			RelativePath="..\..\src\fltk3zlib\adler32.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -184,7 +184,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\compress.c"
+			RelativePath="..\..\src\fltk3zlib\compress.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -207,7 +207,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\crc32.c"
+			RelativePath="..\..\src\fltk3zlib\crc32.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -230,7 +230,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\deflate.c"
+			RelativePath="..\..\src\fltk3zlib\deflate.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -253,7 +253,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\gzclose.c"
+			RelativePath="..\..\src\fltk3zlib\gzclose.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -276,7 +276,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\gzlib.c"
+			RelativePath="..\..\src\fltk3zlib\gzlib.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -299,7 +299,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\gzread.c"
+			RelativePath="..\..\src\fltk3zlib\gzread.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -322,7 +322,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\gzwrite.c"
+			RelativePath="..\..\src\fltk3zlib\gzwrite.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -345,7 +345,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\infback.c"
+			RelativePath="..\..\src\fltk3zlib\infback.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -368,7 +368,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\inffast.c"
+			RelativePath="..\..\src\fltk3zlib\inffast.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -391,7 +391,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\inflate.c"
+			RelativePath="..\..\src\fltk3zlib\inflate.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -414,7 +414,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\inftrees.c"
+			RelativePath="..\..\src\fltk3zlib\inftrees.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -437,7 +437,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\trees.c"
+			RelativePath="..\..\src\fltk3zlib\trees.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -460,7 +460,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\uncompr.c"
+			RelativePath="..\..\src\fltk3zlib\uncompr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -483,7 +483,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\zlib\zutil.c"
+			RelativePath="..\..\src\fltk3zlib\zutil.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

Modified: branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -93,7 +93,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\core\Fl.cxx">
+    <ClCompile Include="..\..\src\fltk3\run.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -93,83 +93,90 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\core\Fl_Gl_Choice.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\GLChoice.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\Fl_Gl_Device_Plugin.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\GLDevicePlugin.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\Fl_Gl_Overlay.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\GLOverlay.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\Fl_Gl_Window.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\GLWindow.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\freeglut_geometry.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\freeglut_geometry.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\freeglut_stroke_mono_roman.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\freeglut_stroke_mono_roman.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\freeglut_stroke_roman.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\freeglut_stroke_roman.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\freeglut_teapot.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\freeglut_teapot.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\gl_draw.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\gl_draw.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\glut_compatability.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\gl_start.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\glut_font.cxx">
+    <ClCompile Include="..\..\src\fltk3gl\glut_compatability.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\..\src\fltk3gl\glut_font.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="fltk3.vcxproj">

Modified: branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -93,322 +93,322 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\jpeg\jaricom.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jaricom.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcarith.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcarith.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdarith.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdarith.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcapimin.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcapimin.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcapistd.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcapistd.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jccoefct.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jccoefct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jccolor.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jccolor.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcdctmgr.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcdctmgr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jchuff.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jchuff.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcinit.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcinit.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcmainct.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcmainct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcmarker.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcmarker.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcmaster.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcmaster.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcomapi.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcomapi.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcparam.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcparam.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcprepct.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcprepct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jcsample.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jcsample.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jctrans.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jctrans.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdapimin.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdapimin.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdapistd.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdapistd.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdatadst.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdatadst.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdatasrc.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdatasrc.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdcoefct.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdcoefct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdcolor.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdcolor.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jddctmgr.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jddctmgr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdhuff.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdhuff.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdinput.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdinput.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdmainct.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdmainct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdmarker.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdmarker.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdmaster.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdmaster.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdmerge.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdmerge.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdpostct.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdpostct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdsample.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdsample.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jdtrans.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jdtrans.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jerror.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jerror.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jfdctflt.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jfdctflt.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jfdctfst.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jfdctfst.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jfdctint.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jfdctint.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jidctflt.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jidctflt.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jidctfst.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jidctfst.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jidctint.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jidctint.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jmemmgr.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jmemmgr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jmemnobs.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jmemnobs.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jquant1.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jquant1.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jquant2.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jquant2.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\jpeg\jutils.c">
+    <ClCompile Include="..\..\src\fltk3jpeg\jutils.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -93,105 +93,105 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\png\png.c">
+    <ClCompile Include="..\..\src\fltk3png\png.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngerror.c">
+    <ClCompile Include="..\..\src\fltk3png\pngerror.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngget.c">
+    <ClCompile Include="..\..\src\fltk3png\pngget.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngmem.c">
+    <ClCompile Include="..\..\src\fltk3png\pngmem.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngpread.c">
+    <ClCompile Include="..\..\src\fltk3png\pngpread.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngread.c">
+    <ClCompile Include="..\..\src\fltk3png\pngread.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngrio.c">
+    <ClCompile Include="..\..\src\fltk3png\pngrio.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngrtran.c">
+    <ClCompile Include="..\..\src\fltk3png\pngrtran.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngrutil.c">
+    <ClCompile Include="..\..\src\fltk3png\pngrutil.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngset.c">
+    <ClCompile Include="..\..\src\fltk3png\pngset.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngtrans.c">
+    <ClCompile Include="..\..\src\fltk3png\pngtrans.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngwio.c">
+    <ClCompile Include="..\..\src\fltk3png\pngwio.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngwrite.c">
+    <ClCompile Include="..\..\src\fltk3png\pngwrite.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngwtran.c">
+    <ClCompile Include="..\..\src\fltk3png\pngwtran.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\png\pngwutil.c">
+    <ClCompile Include="..\..\src\fltk3png\pngwutil.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -93,105 +93,105 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\zlib\adler32.c">
+    <ClCompile Include="..\..\src\fltk3zlib\adler32.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\compress.c">
+    <ClCompile Include="..\..\src\fltk3zlib\compress.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\crc32.c">
+    <ClCompile Include="..\..\src\fltk3zlib\crc32.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\deflate.c">
+    <ClCompile Include="..\..\src\fltk3zlib\deflate.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\gzclose.c">
+    <ClCompile Include="..\..\src\fltk3zlib\gzclose.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\gzlib.c">
+    <ClCompile Include="..\..\src\fltk3zlib\gzlib.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\gzread.c">
+    <ClCompile Include="..\..\src\fltk3zlib\gzread.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\gzwrite.c">
+    <ClCompile Include="..\..\src\fltk3zlib\gzwrite.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\infback.c">
+    <ClCompile Include="..\..\src\fltk3zlib\infback.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\inffast.c">
+    <ClCompile Include="..\..\src\fltk3zlib\inffast.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\inflate.c">
+    <ClCompile Include="..\..\src\fltk3zlib\inflate.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\inftrees.c">
+    <ClCompile Include="..\..\src\fltk3zlib\inftrees.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\trees.c">
+    <ClCompile Include="..\..\src\fltk3zlib\trees.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\uncompr.c">
+    <ClCompile Include="..\..\src\fltk3zlib\uncompr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\zlib\zutil.c">
+    <ClCompile Include="..\..\src\fltk3zlib\zutil.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/branch-3.0/ide/VisualC6/fltk3.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3.dsp	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC6/fltk3.dsp	2011-08-25 11:40:26 UTC (rev 9010)
@@ -83,7 +83,7 @@
 # Name "fltk3 - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\src\core\Fl.cxx
+SOURCE=..\..\src\fltk3\run.cxx
 # End Source File
 # Begin Source File
 

Modified: branches/branch-3.0/ide/VisualC6/fltk3gl.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3gl.dsp	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC6/fltk3gl.dsp	2011-08-25 11:40:26 UTC (rev 9010)
@@ -83,47 +83,51 @@
 # Name "fltk3gl - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\src\core\Fl_Gl_Choice.cxx
+SOURCE=..\..\src\fltk3gl\GLChoice.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\Fl_Gl_Device_Plugin.cxx
+SOURCE=..\..\src\fltk3gl\GLDevicePlugin.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\Fl_Gl_Overlay.cxx
+SOURCE=..\..\src\fltk3gl\GLOverlay.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\Fl_Gl_Window.cxx
+SOURCE=..\..\src\fltk3gl\GLWindow.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\freeglut_geometry.cxx
+SOURCE=..\..\src\fltk3gl\freeglut_geometry.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\freeglut_stroke_mono_roman.cxx
+SOURCE=..\..\src\fltk3gl\freeglut_stroke_mono_roman.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\freeglut_stroke_roman.cxx
+SOURCE=..\..\src\fltk3gl\freeglut_stroke_roman.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\freeglut_teapot.cxx
+SOURCE=..\..\src\fltk3gl\freeglut_teapot.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\gl_draw.cxx
+SOURCE=..\..\src\fltk3gl\gl_draw.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\glut_compatability.cxx
+SOURCE=..\..\src\fltk3gl\gl_start.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\core\glut_font.cxx
+SOURCE=..\..\src\fltk3gl\glut_compatability.cxx
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fltk3gl\glut_font.cxx
+# End Source File
 # End Target
 # End Project

Modified: branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp	2011-08-25 11:40:26 UTC (rev 9010)
@@ -83,187 +83,187 @@
 # Name "fltk3jpeg - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jaricom.c
+SOURCE=..\..\src\fltk3jpeg\jaricom.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcarith.c
+SOURCE=..\..\src\fltk3jpeg\jcarith.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdarith.c
+SOURCE=..\..\src\fltk3jpeg\jdarith.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcapimin.c
+SOURCE=..\..\src\fltk3jpeg\jcapimin.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcapistd.c
+SOURCE=..\..\src\fltk3jpeg\jcapistd.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jccoefct.c
+SOURCE=..\..\src\fltk3jpeg\jccoefct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jccolor.c
+SOURCE=..\..\src\fltk3jpeg\jccolor.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcdctmgr.c
+SOURCE=..\..\src\fltk3jpeg\jcdctmgr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jchuff.c
+SOURCE=..\..\src\fltk3jpeg\jchuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcinit.c
+SOURCE=..\..\src\fltk3jpeg\jcinit.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcmainct.c
+SOURCE=..\..\src\fltk3jpeg\jcmainct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcmarker.c
+SOURCE=..\..\src\fltk3jpeg\jcmarker.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcmaster.c
+SOURCE=..\..\src\fltk3jpeg\jcmaster.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcomapi.c
+SOURCE=..\..\src\fltk3jpeg\jcomapi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcparam.c
+SOURCE=..\..\src\fltk3jpeg\jcparam.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcprepct.c
+SOURCE=..\..\src\fltk3jpeg\jcprepct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jcsample.c
+SOURCE=..\..\src\fltk3jpeg\jcsample.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jctrans.c
+SOURCE=..\..\src\fltk3jpeg\jctrans.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdapimin.c
+SOURCE=..\..\src\fltk3jpeg\jdapimin.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdapistd.c
+SOURCE=..\..\src\fltk3jpeg\jdapistd.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdatadst.c
+SOURCE=..\..\src\fltk3jpeg\jdatadst.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdatasrc.c
+SOURCE=..\..\src\fltk3jpeg\jdatasrc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdcoefct.c
+SOURCE=..\..\src\fltk3jpeg\jdcoefct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdcolor.c
+SOURCE=..\..\src\fltk3jpeg\jdcolor.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jddctmgr.c
+SOURCE=..\..\src\fltk3jpeg\jddctmgr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdhuff.c
+SOURCE=..\..\src\fltk3jpeg\jdhuff.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdinput.c
+SOURCE=..\..\src\fltk3jpeg\jdinput.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdmainct.c
+SOURCE=..\..\src\fltk3jpeg\jdmainct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdmarker.c
+SOURCE=..\..\src\fltk3jpeg\jdmarker.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdmaster.c
+SOURCE=..\..\src\fltk3jpeg\jdmaster.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdmerge.c
+SOURCE=..\..\src\fltk3jpeg\jdmerge.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdpostct.c
+SOURCE=..\..\src\fltk3jpeg\jdpostct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdsample.c
+SOURCE=..\..\src\fltk3jpeg\jdsample.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jdtrans.c
+SOURCE=..\..\src\fltk3jpeg\jdtrans.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jerror.c
+SOURCE=..\..\src\fltk3jpeg\jerror.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jfdctflt.c
+SOURCE=..\..\src\fltk3jpeg\jfdctflt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jfdctfst.c
+SOURCE=..\..\src\fltk3jpeg\jfdctfst.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jfdctint.c
+SOURCE=..\..\src\fltk3jpeg\jfdctint.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jidctflt.c
+SOURCE=..\..\src\fltk3jpeg\jidctflt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jidctfst.c
+SOURCE=..\..\src\fltk3jpeg\jidctfst.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jidctint.c
+SOURCE=..\..\src\fltk3jpeg\jidctint.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jmemmgr.c
+SOURCE=..\..\src\fltk3jpeg\jmemmgr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jmemnobs.c
+SOURCE=..\..\src\fltk3jpeg\jmemnobs.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jquant1.c
+SOURCE=..\..\src\fltk3jpeg\jquant1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jquant2.c
+SOURCE=..\..\src\fltk3jpeg\jquant2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\jpeg\jutils.c
+SOURCE=..\..\src\fltk3jpeg\jutils.c
 # End Source File
 # End Target
 # End Project

Modified: branches/branch-3.0/ide/VisualC6/fltk3png.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3png.dsp	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC6/fltk3png.dsp	2011-08-25 11:40:26 UTC (rev 9010)
@@ -83,63 +83,63 @@
 # Name "fltk3png - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\src\png\png.c
+SOURCE=..\..\src\fltk3png\png.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngerror.c
+SOURCE=..\..\src\fltk3png\pngerror.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngget.c
+SOURCE=..\..\src\fltk3png\pngget.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngmem.c
+SOURCE=..\..\src\fltk3png\pngmem.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngpread.c
+SOURCE=..\..\src\fltk3png\pngpread.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngread.c
+SOURCE=..\..\src\fltk3png\pngread.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngrio.c
+SOURCE=..\..\src\fltk3png\pngrio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngrtran.c
+SOURCE=..\..\src\fltk3png\pngrtran.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngrutil.c
+SOURCE=..\..\src\fltk3png\pngrutil.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngset.c
+SOURCE=..\..\src\fltk3png\pngset.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngtrans.c
+SOURCE=..\..\src\fltk3png\pngtrans.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngwio.c
+SOURCE=..\..\src\fltk3png\pngwio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngwrite.c
+SOURCE=..\..\src\fltk3png\pngwrite.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngwtran.c
+SOURCE=..\..\src\fltk3png\pngwtran.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\png\pngwutil.c
+SOURCE=..\..\src\fltk3png\pngwutil.c
 # End Source File
 # End Target
 # End Project

Modified: branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp	2011-08-25 11:40:26 UTC (rev 9010)
@@ -83,63 +83,63 @@
 # Name "fltk3zlib - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\..\src\zlib\adler32.c
+SOURCE=..\..\src\fltk3zlib\adler32.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\compress.c
+SOURCE=..\..\src\fltk3zlib\compress.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\crc32.c
+SOURCE=..\..\src\fltk3zlib\crc32.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\deflate.c
+SOURCE=..\..\src\fltk3zlib\deflate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\gzclose.c
+SOURCE=..\..\src\fltk3zlib\gzclose.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\gzlib.c
+SOURCE=..\..\src\fltk3zlib\gzlib.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\gzread.c
+SOURCE=..\..\src\fltk3zlib\gzread.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\gzwrite.c
+SOURCE=..\..\src\fltk3zlib\gzwrite.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\infback.c
+SOURCE=..\..\src\fltk3zlib\infback.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\inffast.c
+SOURCE=..\..\src\fltk3zlib\inffast.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\inflate.c
+SOURCE=..\..\src\fltk3zlib\inflate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\inftrees.c
+SOURCE=..\..\src\fltk3zlib\inftrees.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\trees.c
+SOURCE=..\..\src\fltk3zlib\trees.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\uncompr.c
+SOURCE=..\..\src\fltk3zlib\uncompr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\zlib\zutil.c
+SOURCE=..\..\src\fltk3zlib\zutil.c
 # End Source File
 # End Target
 # End Project

Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj	2011-08-25 11:40:26 UTC (rev 9010)
@@ -234,12 +234,6 @@
 		742D204F4CECC650D53AC070 /* FormsPixmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E62E615D0C146DBB74B477A /* FormsPixmap.h */; };
 		6A197BCC5117B3666D368B25 /* Free.h in Headers */ = {isa = PBXBuildFile; fileRef = 11F5FE43FEC401E52D4CABB7 /* Free.h */; };
 		8845649A10159ECED0C93211 /* GIFImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 605121E099731EF9977E11C8 /* GIFImage.h */; };
-		53065D004FF8B488CFA68C55 /* gl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA155A8649051FED3B16258B /* gl.h */; };
-		72812FEB6E612A0102F3DE4D /* gl2opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6AC61280BAAD923E036E896A /* gl2opengl.h */; };
-		48257DCA29CAA7C8AA38665E /* glDraw.h in Headers */ = {isa = PBXBuildFile; fileRef = B10175537ACF3F6627DF6DB1 /* glDraw.h */; };
-		4DB7B8EB28DA172D8049A0C9 /* glu.h in Headers */ = {isa = PBXBuildFile; fileRef = 853E4A1DF4DE711A3C103971 /* glu.h */; };
-		665EED203FE4C3E866EA7551 /* glut.h in Headers */ = {isa = PBXBuildFile; fileRef = D910C663A8F3170318F324D9 /* glut.h */; };
-		7A5AD5C30E7CB63E2E02E9F8 /* GlWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F9673F325010BCD774A4A13D /* GlWindow.h */; };
 		5E1D236DDF180951F39D88D0 /* Group.h in Headers */ = {isa = PBXBuildFile; fileRef = 91EA037664D5A2D49603F364 /* Group.h */; };
 		F7A66B0ADC3A359551BB84FB /* HelpDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 0925F19306CD3458397661F3 /* HelpDialog.h */; };
 		E5826346717EA4FA214A9B1B /* HelpView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD096CD5808EADB1B646DB4 /* HelpView.h */; };
@@ -343,17 +337,25 @@
 		ACA9550AC903E3D31D80B160 /* XPMImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C163988CD45E6AB4710982F /* XPMImage.h */; };
 		E0943D9D77DD934578EBF9DF /* Xutf8.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E1B408952EFBB79A46CDE69 /* Xutf8.h */; };
 		CF5FA17E9AD84BE1BB907031 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14F66311E977D66CE29024C3 /* Cocoa.framework */; };
-		E1C77AA3B54E8E48277C3538 /* Fl_Gl_Choice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DE5C107D549D9A4AFBEF3B60 /* Fl_Gl_Choice.cxx */; };
-		E8D5789A3FCFB823CBE99BDE /* Fl_Gl_Device_Plugin.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 391E3B0B723D3B5BEC865531 /* Fl_Gl_Device_Plugin.cxx */; };
-		070BED62A8E9EB609EBED411 /* Fl_Gl_Overlay.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 07BC5E29BD251DDB7204BFDA /* Fl_Gl_Overlay.cxx */; };
-		32BC3E68C69915E6305FD0AA /* Fl_Gl_Window.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 53DC629E1A4DC60F75B5DB21 /* Fl_Gl_Window.cxx */; };
+		E1C77AA3B54E8E48277C3538 /* GLChoice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DE5C107D549D9A4AFBEF3B60 /* GLChoice.cxx */; };
+		E8D5789A3FCFB823CBE99BDE /* GLDevicePlugin.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 391E3B0B723D3B5BEC865531 /* GLDevicePlugin.cxx */; };
+		070BED62A8E9EB609EBED411 /* GLOverlay.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 07BC5E29BD251DDB7204BFDA /* GLOverlay.cxx */; };
+		32BC3E68C69915E6305FD0AA /* GLWindow.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 53DC629E1A4DC60F75B5DB21 /* GLWindow.cxx */; };
 		ECB8D856706DB17278C0CBF3 /* freeglut_geometry.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFAAC0780324B089398B7046 /* freeglut_geometry.cxx */; };
 		75788B42FA61D5F0C7324344 /* freeglut_stroke_mono_roman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 504FF704C99A88103373D40F /* freeglut_stroke_mono_roman.cxx */; };
 		9CDFF78211A53B61A9B2F2CC /* freeglut_stroke_roman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B2D08460CDF27CADC1A1A460 /* freeglut_stroke_roman.cxx */; };
 		CE3D60CB6B8286E8E2155791 /* freeglut_teapot.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9F61A674FB4A2BA8A83F337A /* freeglut_teapot.cxx */; };
 		008A289F719739FD1947D877 /* gl_draw.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CBE8D5E4422EFEBE652AE41A /* gl_draw.cxx */; };
+		DED2BAE994607138073A5321 /* gl_start.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EC3E5EA34B66D57E36F8BDA2 /* gl_start.cxx */; };
 		4432E2FF464147568FACEC8A /* glut_compatability.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7458D589FF4368F8F83EDDDE /* glut_compatability.cxx */; };
 		52743D1F8ECF932A110D8886 /* glut_font.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8A51D2BA28A5B8309F60F380 /* glut_font.cxx */; };
+		B7A25ADB27ADCE0C4BC87FF4 /* all.h in Headers */ = {isa = PBXBuildFile; fileRef = CED790200D16A60047341619 /* all.h */; };
+		EBA510477FE0A3ED2E3A2A19 /* fltk3gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A9932F3639B774F7BAEE86 /* fltk3gl.h */; };
+		53065D004FF8B488CFA68C55 /* gl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA155A8649051FED3B16258B /* gl.h */; };
+		48257DCA29CAA7C8AA38665E /* glDraw.h in Headers */ = {isa = PBXBuildFile; fileRef = B10175537ACF3F6627DF6DB1 /* glDraw.h */; };
+		4DB7B8EB28DA172D8049A0C9 /* glu.h in Headers */ = {isa = PBXBuildFile; fileRef = 853E4A1DF4DE711A3C103971 /* glu.h */; };
+		665EED203FE4C3E866EA7551 /* glut.h in Headers */ = {isa = PBXBuildFile; fileRef = D910C663A8F3170318F324D9 /* glut.h */; };
+		7A5AD5C30E7CB63E2E02E9F8 /* GLWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F9673F325010BCD774A4A13D /* GLWindow.h */; };
 		A4C556C6862A8E1DEBEFB3EF /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F784E3D3F229DB4B54D18DC /* AGL.framework */; };
 		EC9763DB2EFC72ACBE6F557D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74F320856CA55C5B27D76923 /* OpenGL.framework */; };
 		374185370DF817EF401AD7FB /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39E229DEF1CA3739A0890F43 /* ApplicationServices.framework */; };
@@ -3915,12 +3917,6 @@
 		7E62E615D0C146DBB74B477A /* FormsPixmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FormsPixmap.h; path = ../../include/fltk3/FormsPixmap.h; sourceTree = SOURCE_ROOT; };
 		11F5FE43FEC401E52D4CABB7 /* Free.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Free.h; path = ../../include/fltk3/Free.h; sourceTree = SOURCE_ROOT; };
 		605121E099731EF9977E11C8 /* GIFImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GIFImage.h; path = ../../include/fltk3/GIFImage.h; sourceTree = SOURCE_ROOT; };
-		AA155A8649051FED3B16258B /* gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl.h; path = ../../include/fltk3/gl.h; sourceTree = SOURCE_ROOT; };
-		6AC61280BAAD923E036E896A /* gl2opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2opengl.h; path = ../../include/fltk3/gl2opengl.h; sourceTree = SOURCE_ROOT; };
-		B10175537ACF3F6627DF6DB1 /* glDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glDraw.h; path = ../../include/fltk3/glDraw.h; sourceTree = SOURCE_ROOT; };
-		853E4A1DF4DE711A3C103971 /* glu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glu.h; path = ../../include/fltk3/glu.h; sourceTree = SOURCE_ROOT; };
-		D910C663A8F3170318F324D9 /* glut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glut.h; path = ../../include/fltk3/glut.h; sourceTree = SOURCE_ROOT; };
-		F9673F325010BCD774A4A13D /* GlWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GlWindow.h; path = ../../include/fltk3/GlWindow.h; sourceTree = SOURCE_ROOT; };
 		91EA037664D5A2D49603F364 /* Group.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Group.h; path = ../../include/fltk3/Group.h; sourceTree = SOURCE_ROOT; };
 		0925F19306CD3458397661F3 /* HelpDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelpDialog.h; path = ../../include/fltk3/HelpDialog.h; sourceTree = SOURCE_ROOT; };
 		0CD096CD5808EADB1B646DB4 /* HelpView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelpView.h; path = ../../include/fltk3/HelpView.h; sourceTree = SOURCE_ROOT; };
@@ -4178,17 +4174,25 @@
 		35196210FA39F50016C06ED2 /* is_spacing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_spacing.c; path = ../../src/core/xutf8/is_spacing.c; sourceTree = SOURCE_ROOT; };
 		14F66311E977D66CE29024C3 /* Cocoa.framework */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
 		86C380FE76A739F296A44961 /* fltk3.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = fltk3.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		DE5C107D549D9A4AFBEF3B60 /* Fl_Gl_Choice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Gl_Choice.cxx; path = ../../src/core/Fl_Gl_Choice.cxx; sourceTree = SOURCE_ROOT; };
-		391E3B0B723D3B5BEC865531 /* Fl_Gl_Device_Plugin.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Gl_Device_Plugin.cxx; path = ../../src/core/Fl_Gl_Device_Plugin.cxx; sourceTree = SOURCE_ROOT; };
-		07BC5E29BD251DDB7204BFDA /* Fl_Gl_Overlay.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Gl_Overlay.cxx; path = ../../src/core/Fl_Gl_Overlay.cxx; sourceTree = SOURCE_ROOT; };
-		53DC629E1A4DC60F75B5DB21 /* Fl_Gl_Window.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Gl_Window.cxx; path = ../../src/core/Fl_Gl_Window.cxx; sourceTree = SOURCE_ROOT; };
-		FFAAC0780324B089398B7046 /* freeglut_geometry.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_geometry.cxx; path = ../../src/core/freeglut_geometry.cxx; sourceTree = SOURCE_ROOT; };
-		504FF704C99A88103373D40F /* freeglut_stroke_mono_roman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_stroke_mono_roman.cxx; path = ../../src/core/freeglut_stroke_mono_roman.cxx; sourceTree = SOURCE_ROOT; };
-		B2D08460CDF27CADC1A1A460 /* freeglut_stroke_roman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_stroke_roman.cxx; path = ../../src/core/freeglut_stroke_roman.cxx; sourceTree = SOURCE_ROOT; };
-		9F61A674FB4A2BA8A83F337A /* freeglut_teapot.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_teapot.cxx; path = ../../src/core/freeglut_teapot.cxx; sourceTree = SOURCE_ROOT; };
-		CBE8D5E4422EFEBE652AE41A /* gl_draw.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gl_draw.cxx; path = ../../src/core/gl_draw.cxx; sourceTree = SOURCE_ROOT; };
-		7458D589FF4368F8F83EDDDE /* glut_compatability.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glut_compatability.cxx; path = ../../src/core/glut_compatability.cxx; sourceTree = SOURCE_ROOT; };
-		8A51D2BA28A5B8309F60F380 /* glut_font.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glut_font.cxx; path = ../../src/core/glut_font.cxx; sourceTree = SOURCE_ROOT; };
+		CED790200D16A60047341619 /* all.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = all.h; path = ../../include/fltk3gl/all.h; sourceTree = SOURCE_ROOT; };
+		53A9932F3639B774F7BAEE86 /* fltk3gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fltk3gl.h; path = ../../include/fltk3gl/fltk3gl.h; sourceTree = SOURCE_ROOT; };
+		AA155A8649051FED3B16258B /* gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl.h; path = ../../include/fltk3gl/gl.h; sourceTree = SOURCE_ROOT; };
+		B10175537ACF3F6627DF6DB1 /* glDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glDraw.h; path = ../../include/fltk3gl/glDraw.h; sourceTree = SOURCE_ROOT; };
+		853E4A1DF4DE711A3C103971 /* glu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glu.h; path = ../../include/fltk3gl/glu.h; sourceTree = SOURCE_ROOT; };
+		D910C663A8F3170318F324D9 /* glut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glut.h; path = ../../include/fltk3gl/glut.h; sourceTree = SOURCE_ROOT; };
+		F9673F325010BCD774A4A13D /* GLWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLWindow.h; path = ../../include/fltk3gl/GLWindow.h; sourceTree = SOURCE_ROOT; };
+		DE5C107D549D9A4AFBEF3B60 /* GLChoice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GLChoice.cxx; path = ../../src/fltk3gl/GLChoice.cxx; sourceTree = SOURCE_ROOT; };
+		391E3B0B723D3B5BEC865531 /* GLDevicePlugin.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GLDevicePlugin.cxx; path = ../../src/fltk3gl/GLDevicePlugin.cxx; sourceTree = SOURCE_ROOT; };
+		07BC5E29BD251DDB7204BFDA /* GLOverlay.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GLOverlay.cxx; path = ../../src/fltk3gl/GLOverlay.cxx; sourceTree = SOURCE_ROOT; };
+		53DC629E1A4DC60F75B5DB21 /* GLWindow.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GLWindow.cxx; path = ../../src/fltk3gl/GLWindow.cxx; sourceTree = SOURCE_ROOT; };
+		FFAAC0780324B089398B7046 /* freeglut_geometry.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_geometry.cxx; path = ../../src/fltk3gl/freeglut_geometry.cxx; sourceTree = SOURCE_ROOT; };
+		504FF704C99A88103373D40F /* freeglut_stroke_mono_roman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_stroke_mono_roman.cxx; path = ../../src/fltk3gl/freeglut_stroke_mono_roman.cxx; sourceTree = SOURCE_ROOT; };
+		B2D08460CDF27CADC1A1A460 /* freeglut_stroke_roman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_stroke_roman.cxx; path = ../../src/fltk3gl/freeglut_stroke_roman.cxx; sourceTree = SOURCE_ROOT; };
+		9F61A674FB4A2BA8A83F337A /* freeglut_teapot.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeglut_teapot.cxx; path = ../../src/fltk3gl/freeglut_teapot.cxx; sourceTree = SOURCE_ROOT; };
+		CBE8D5E4422EFEBE652AE41A /* gl_draw.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gl_draw.cxx; path = ../../src/fltk3gl/gl_draw.cxx; sourceTree = SOURCE_ROOT; };
+		EC3E5EA34B66D57E36F8BDA2 /* gl_start.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gl_start.cxx; path = ../../src/fltk3gl/gl_start.cxx; sourceTree = SOURCE_ROOT; };
+		7458D589FF4368F8F83EDDDE /* glut_compatability.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glut_compatability.cxx; path = ../../src/fltk3gl/glut_compatability.cxx; sourceTree = SOURCE_ROOT; };
+		8A51D2BA28A5B8309F60F380 /* glut_font.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glut_font.cxx; path = ../../src/fltk3gl/glut_font.cxx; sourceTree = SOURCE_ROOT; };
 		9F784E3D3F229DB4B54D18DC /* AGL.framework */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.framework; name = AGL.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/AGL.framework; sourceTree = DEVELOPER_DIR; };
 		74F320856CA55C5B27D76923 /* OpenGL.framework */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; };
 		39E229DEF1CA3739A0890F43 /* ApplicationServices.framework */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework; sourceTree = DEVELOPER_DIR; };
@@ -5336,12 +5340,6 @@
 				7E62E615D0C146DBB74B477A /* FormsPixmap.h */,
 				11F5FE43FEC401E52D4CABB7 /* Free.h */,
 				605121E099731EF9977E11C8 /* GIFImage.h */,
-				AA155A8649051FED3B16258B /* gl.h */,
-				6AC61280BAAD923E036E896A /* gl2opengl.h */,
-				B10175537ACF3F6627DF6DB1 /* glDraw.h */,
-				853E4A1DF4DE711A3C103971 /* glu.h */,
-				D910C663A8F3170318F324D9 /* glut.h */,
-				F9673F325010BCD774A4A13D /* GlWindow.h */,
 				91EA037664D5A2D49603F364 /* Group.h */,
 				0925F19306CD3458397661F3 /* HelpDialog.h */,
 				0CD096CD5808EADB1B646DB4 /* HelpView.h */,
@@ -5626,18 +5624,33 @@
 			name = fltk3;
 			sourceTree = "<group>";
 		};
+		C95C7D1D61D8113B0374F9C7 /* Headers */ = {
+			isa = PBXGroup;
+			children = (
+				CED790200D16A60047341619 /* all.h */,
+				53A9932F3639B774F7BAEE86 /* fltk3gl.h */,
+				AA155A8649051FED3B16258B /* gl.h */,
+				B10175537ACF3F6627DF6DB1 /* glDraw.h */,
+				853E4A1DF4DE711A3C103971 /* glu.h */,
+				D910C663A8F3170318F324D9 /* glut.h */,
+				F9673F325010BCD774A4A13D /* GLWindow.h */,
+			);
+			name = Headers;
+			sourceTree = "<group>";
+		};
 		AF239AB59EBE13BBE12676A0 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				DE5C107D549D9A4AFBEF3B60 /* Fl_Gl_Choice.cxx */,
-				391E3B0B723D3B5BEC865531 /* Fl_Gl_Device_Plugin.cxx */,
-				07BC5E29BD251DDB7204BFDA /* Fl_Gl_Overlay.cxx */,
-				53DC629E1A4DC60F75B5DB21 /* Fl_Gl_Window.cxx */,
+				DE5C107D549D9A4AFBEF3B60 /* GLChoice.cxx */,
+				391E3B0B723D3B5BEC865531 /* GLDevicePlugin.cxx */,
+				07BC5E29BD251DDB7204BFDA /* GLOverlay.cxx */,
+				53DC629E1A4DC60F75B5DB21 /* GLWindow.cxx */,
 				FFAAC0780324B089398B7046 /* freeglut_geometry.cxx */,
 				504FF704C99A88103373D40F /* freeglut_stroke_mono_roman.cxx */,
 				B2D08460CDF27CADC1A1A460 /* freeglut_stroke_roman.cxx */,
 				9F61A674FB4A2BA8A83F337A /* freeglut_teapot.cxx */,
 				CBE8D5E4422EFEBE652AE41A /* gl_draw.cxx */,
+				EC3E5EA34B66D57E36F8BDA2 /* gl_start.cxx */,
 				7458D589FF4368F8F83EDDDE /* glut_compatability.cxx */,
 				8A51D2BA28A5B8309F60F380 /* glut_font.cxx */,
 			);
@@ -5664,6 +5677,7 @@
 		DF121658483F09B46244CF34 /* fltk3gl */ = {
 			isa = PBXGroup;
 			children = (
+				C95C7D1D61D8113B0374F9C7 /* Headers */,
 				AF239AB59EBE13BBE12676A0 /* Sources */,
 				7FA05EA9EB6F7E67F85F9A93 /* Libraries */,
 				5AD936C12327BF2E9A6A3DA1 /* Dependencies */,
@@ -6586,12 +6600,6 @@
 				742D204F4CECC650D53AC070 /* FormsPixmap.h in Headers */,
 				6A197BCC5117B3666D368B25 /* Free.h in Headers */,
 				8845649A10159ECED0C93211 /* GIFImage.h in Headers */,
-				53065D004FF8B488CFA68C55 /* gl.h in Headers */,
-				72812FEB6E612A0102F3DE4D /* gl2opengl.h in Headers */,
-				48257DCA29CAA7C8AA38665E /* glDraw.h in Headers */,
-				4DB7B8EB28DA172D8049A0C9 /* glu.h in Headers */,
-				665EED203FE4C3E866EA7551 /* glut.h in Headers */,
-				7A5AD5C30E7CB63E2E02E9F8 /* GlWindow.h in Headers */,
 				5E1D236DDF180951F39D88D0 /* Group.h in Headers */,
 				F7A66B0ADC3A359551BB84FB /* HelpDialog.h in Headers */,
 				E5826346717EA4FA214A9B1B /* HelpView.h in Headers */,
@@ -6701,6 +6709,13 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B7A25ADB27ADCE0C4BC87FF4 /* all.h in Headers */,
+				EBA510477FE0A3ED2E3A2A19 /* fltk3gl.h in Headers */,
+				53065D004FF8B488CFA68C55 /* gl.h in Headers */,
+				48257DCA29CAA7C8AA38665E /* glDraw.h in Headers */,
+				4DB7B8EB28DA172D8049A0C9 /* glu.h in Headers */,
+				665EED203FE4C3E866EA7551 /* glut.h in Headers */,
+				7A5AD5C30E7CB63E2E02E9F8 /* GLWindow.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9211,15 +9226,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E1C77AA3B54E8E48277C3538 /* Fl_Gl_Choice.cxx in Sources */,
-				E8D5789A3FCFB823CBE99BDE /* Fl_Gl_Device_Plugin.cxx in Sources */,
-				070BED62A8E9EB609EBED411 /* Fl_Gl_Overlay.cxx in Sources */,
-				32BC3E68C69915E6305FD0AA /* Fl_Gl_Window.cxx in Sources */,
+				E1C77AA3B54E8E48277C3538 /* GLChoice.cxx in Sources */,
+				E8D5789A3FCFB823CBE99BDE /* GLDevicePlugin.cxx in Sources */,
+				070BED62A8E9EB609EBED411 /* GLOverlay.cxx in Sources */,
+				32BC3E68C69915E6305FD0AA /* GLWindow.cxx in Sources */,
 				ECB8D856706DB17278C0CBF3 /* freeglut_geometry.cxx in Sources */,
 				75788B42FA61D5F0C7324344 /* freeglut_stroke_mono_roman.cxx in Sources */,
 				9CDFF78211A53B61A9B2F2CC /* freeglut_stroke_roman.cxx in Sources */,
 				CE3D60CB6B8286E8E2155791 /* freeglut_teapot.cxx in Sources */,
 				008A289F719739FD1947D877 /* gl_draw.cxx in Sources */,
+				DED2BAE994607138073A5321 /* gl_start.cxx in Sources */,
 				4432E2FF464147568FACEC8A /* glut_compatability.cxx in Sources */,
 				52743D1F8ECF932A110D8886 /* glut_font.cxx in Sources */,
 			);

Modified: branches/branch-3.0/include/fltk3/Printer.h
===================================================================
--- branches/branch-3.0/include/fltk3/Printer.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3/Printer.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -128,7 +128,7 @@
    *
    fltk3::Printer allows to use all FLTK drawing, color, text, and clip functions, and to have them operate
    on printed page(s). There are two main, non exclusive, ways to use it.
-   <ul><li>Print any widget (standard, custom, fltk3::Window, fltk3::GlWindow) as it appears 
+   <ul><li>Print any widget (standard, custom, fltk3::Window, fltk3::GLWindow) as it appears 
    on screen, with optional translation, scaling and rotation. This is done by calling print_widget(),
    print_window() or print_window_part().
    <li>Use a series of FLTK graphics commands (e.g., font, text, lines, colors, clip, image) to

Modified: branches/branch-3.0/include/fltk3/Widget.h
===================================================================
--- branches/branch-3.0/include/fltk3/Widget.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3/Widget.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -55,7 +55,7 @@
   class Group;
   class Window;
   class Image;
-  class GlWindow;
+  class GLWindow;
 
   /** Default callback type definition for all fltk widgets (by far the most used) */
   typedef void (Callback)(Widget*, void*);
@@ -949,17 +949,17 @@
      */
     virtual fltk3::Window* as_window() {return 0;}
     
-    /** Returns an fltk3::GlWindow pointer if this widget is an fltk3::GlWindow.
+    /** Returns an fltk3::GLWindow pointer if this widget is an fltk3::GLWindow.
      
      Use this method if you have a widget (pointer) and need to
-     know whether this widget is derived from fltk3::GlWindow. If it returns
-     non-NULL, then the widget in question is derived from fltk3::GlWindow.
+     know whether this widget is derived from fltk3::GLWindow. If it returns
+     non-NULL, then the widget in question is derived from fltk3::GLWindow.
      
-     \retval NULL if this widget is not derived from fltk3::GlWindow.
+     \retval NULL if this widget is not derived from fltk3::GLWindow.
      \note This method is provided to avoid dynamic_cast.
      \see fltk3::Widget::as_group(), fltk3::Widget::as_window()
      */
-    virtual class fltk3::GlWindow* as_gl_window() {return 0;}
+    virtual class fltk3::GLWindow* as_gl_window() {return 0;}
     
     /** For back compatibility only.
      \deprecated Use selection_color() instead.

Modified: branches/branch-3.0/include/fltk3/Window.h
===================================================================
--- branches/branch-3.0/include/fltk3/Window.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3/Window.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -435,7 +435,7 @@
      if it draws a slow graphic. <B>Danger: incremental update is very hard to
      debug and maintain!</B>
      
-     This method only works for the fltk3::Window and fltk3::GlWindow derived classes.
+     This method only works for the fltk3::Window and fltk3::GLWindow derived classes.
      */
     void make_current();
     

Modified: branches/branch-3.0/include/fltk3/enumerations.h
===================================================================
--- branches/branch-3.0/include/fltk3/enumerations.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3/enumerations.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -872,7 +872,7 @@
   };
   
   
-  /** visual types and fltk3::GlWindow::mode() (values match Glut) */
+  /** visual types and fltk3::GLWindow::mode() (values match Glut) */
   enum Mode { 
     RGB	= 0,
     INDEX	= 1,

Modified: branches/branch-3.0/include/fltk3/run.h
===================================================================
--- branches/branch-3.0/include/fltk3/run.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3/run.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -249,9 +249,9 @@
    drawing to work. This <I>must</I> be done if you want to draw in
    normal windows with OpenGL with gl_start() and gl_end().
    It may be useful to call this so your X windows use the same visual
-   as an fltk3::GlWindow, which on some servers will reduce colormap flashing.
+   as an fltk3::GLWindow, which on some servers will reduce colormap flashing.
    
-   See fltk3::GlWindow for a list of additional values for the argument.
+   See fltk3::GLWindow for a list of additional values for the argument.
    */
   int gl_visual(int, int *alist=0); // platform dependent
   void own_colormap();

Copied: branches/branch-3.0/include/fltk3gl/GLWindow.h (from rev 9009, branches/branch-3.0/include/fltk3gl/GL_Window.h)
===================================================================
--- branches/branch-3.0/include/fltk3gl/GLWindow.h	                        (rev 0)
+++ branches/branch-3.0/include/fltk3gl/GLWindow.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,248 @@
+//
+// "$Id: GLWindow.h 8157 2011-01-01 14:01:53Z AlbrechtS $"
+//
+// OpenGL header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::GLWindow widget . */
+
+#ifndef Fltk3_Gl_Window_H
+#define Fltk3_Gl_Window_H
+
+#include <fltk3/Window.h>
+
+#ifndef GLContext
+/**
+ Opaque pointer type to hide system specific implementation.
+ */
+typedef void* GLContext; // actually a GLXContext or HGLDC
+#endif
+
+class Fl_Gl_Window;
+
+namespace fltk3 {
+  
+  class GLChoice; // structure to hold result of glXChooseVisual
+
+  /**
+   The fltk3::GLWindow widget sets things up so OpenGL works.
+   
+   It also keeps an OpenGL "context" for that window, so that changes to the
+   lighting and projection may be reused between redraws. fltk3::GLWindow
+   also flushes the OpenGL streams and swaps buffers after draw() returns.
+   
+   OpenGL hardware typically provides some overlay bit planes, which
+   are very useful for drawing UI controls atop your 3D graphics.  If the
+   overlay hardware is not provided, FLTK tries to simulate the overlay.
+   This works pretty well if your graphics are double buffered, but not
+   very well for single-buffered.
+   
+   Please note that the FLTK drawing and clipping functions
+   will not work inside an fltk3::GLWindow. All drawing
+   should be done using OpenGL calls exclusively.
+   Even though fltk3::GLWindow is derived from fltk3::Group, 
+   it is not useful to add other FLTK Widgets as children,
+   unless those widgets are modified to draw using OpenGL calls.
+   */
+  class FLTK3_EXPORT GLWindow : public fltk3::Window {
+    
+    friend class ::Fl_Gl_Window;
+
+    int mode_;
+    const int *alist;
+    GLChoice *g;
+    GLContext context_;
+    char valid_f_;
+    char damage1_; // damage() of back buffer
+    virtual void draw_overlay();
+    void init();
+    
+    void *overlay;
+    void make_overlay();
+    friend class _Fl_Gl_Overlay;
+    
+    static int can_do(int, const int *);
+    int mode(int, const int *);
+    
+  public:
+    
+    void show();
+    void show(int a, char **b) {Window::show(a,b);}
+    void flush();
+    void hide();
+    void resize(int,int,int,int);
+    int handle(int);
+    
+    /**
+     Is turned off when FLTK creates a new context for this window or 
+     when the window resizes, and is turned on \e after draw() is called.
+     You can use this inside your draw() method to avoid unnecessarily
+     initializing the OpenGL context. Just do this:
+     \code
+     void mywindow::draw() {
+     if (!valid()) {
+     glViewport(0,0,w(),h());
+     glFrustum(...);
+     ...other initialization...
+     }
+     if (!context_valid()) {
+     ...load textures, etc. ...
+     }
+     ... draw your geometry here ...
+     }
+     \endcode
+     
+     You can turn valid() on by calling valid(1).  You
+     should only do this after fixing the transformation inside a draw()
+     or after make_current().  This is done automatically after 
+     draw() returns.
+     */
+    char valid() const {return valid_f_ & 1;}
+    /**
+     See char fltk3::GLWindow::valid() const 
+     */
+    void valid(char v) {if (v) valid_f_ |= 1; else valid_f_ &= 0xfe;}
+    void invalidate();
+    
+    /**
+     Will only be set if the 
+     OpenGL context is created or recreated. It differs from
+     fltk3::GLWindow::valid() which is also set whenever the context
+     changes size.
+     */
+    char context_valid() const {return valid_f_ & 2;}
+    /**
+     See char fltk3::GLWindow::context_valid() const 
+     */
+    void context_valid(char v) {if (v) valid_f_ |= 2; else valid_f_ &= 0xfd;}
+    
+    /**  Returns non-zero if the hardware supports the given or current OpenGL mode. */
+    static int can_do(int m) {return can_do(m,0);}
+    /**  Returns non-zero if the hardware supports the given or current OpenGL mode. */
+    static int can_do(const int *m) {return can_do(0, m);}
+    /**  Returns non-zero if the hardware supports the given or current OpenGL mode. */
+    int can_do() {return can_do(mode_,alist);}
+    /**
+     Set or change the OpenGL capabilites of the window.  The value can be
+     any of the following OR'd together:
+     
+     - \c fltk3::RGB - RGB color (not indexed)
+     - \c fltk3::RGB8 - RGB color with at least 8 bits of each color
+     - \c fltk3::INDEX - Indexed mode
+     - \c fltk3::SINGLE - not double buffered
+     - \c fltk3::DOUBLE - double buffered
+     - \c fltk3::ACCUM - accumulation buffer
+     - \c fltk3::ALPHA - alpha channel in color
+     - \c fltk3::DEPTH - depth buffer
+     - \c fltk3::STENCIL - stencil buffer
+     - \c fltk3::MULTISAMPLE - multisample antialiasing
+     
+     fltk3::RGB and fltk3::SINGLE have a value of zero, so they
+     are "on" unless you give fltk3::INDEX or fltk3::DOUBLE.
+     
+     If the desired combination cannot be done, FLTK will try turning off 
+     fltk3::MULTISAMPLE.  If this also fails the show() will call 
+     fltk3::error() and not show the window.
+     
+     You can change the mode while the window is displayed.  This is most
+     useful for turning double-buffering on and off.  Under X this will
+     cause the old X window to be destroyed and a new one to be created.  If
+     this is a top-level window this will unfortunately also cause the
+     window to blink, raise to the top, and be de-iconized, and the xid()
+     will change, possibly breaking other code.  It is best to make the GL
+     window a child of another window if you wish to do this!
+     
+     mode() must not be called within draw() since it
+     changes the current context.
+     */
+    fltk3::Mode mode() const {return (fltk3::Mode)mode_;}
+    /** See fltk3::Mode mode() const */
+    int mode(int a) {return mode(a,0);}
+    /** See fltk3::Mode mode() const */
+    int mode(const int *a) {return mode(0, a);}
+    /** void See void context(void* v, int destroy_flag) */
+    void* context() const {return context_;}
+    void context(void*, int destroy_flag = 0);
+    void make_current();
+    void swap_buffers();
+    void ortho();
+    
+    /**
+     Returns true if the hardware overlay is possible.  If this is false,
+     FLTK will try to simulate the overlay, with significant loss of update
+     speed.  Calling this will cause FLTK to open the display.
+     */
+    int can_do_overlay();
+    /**
+     This method causes draw_overlay() to be called at a later time.
+     Initially the overlay is clear. If you want the window to display
+     something in the overlay when it first appears, you must call this
+     immediately after you show() your window.
+     */
+    void redraw_overlay();
+    void hide_overlay();
+    /**
+     The make_overlay_current() method selects the OpenGL context
+     for the widget's overlay.  It is called automatically prior to the 
+     draw_overlay() method being called and can also be used to
+     implement feedback and/or selection within the handle()
+     method.
+     */
+    void make_overlay_current();
+    
+    // Note: Doxygen docs in Widget.h to avoid redundancy.
+    virtual fltk3::GLWindow* as_gl_window() {return this;}
+    
+    ~GLWindow();
+    /**
+     Creates a new fltk3::GLWindow widget using the given size, and label string. 
+     The default boxtype is fltk3::NO_BOX. The default mode is fltk3::RGB|fltk3::DOUBLE|fltk3::DEPTH.
+     */
+    GLWindow(int W, int H, const char *l=0) : fltk3::Window(W,H,l) {init();}
+    /**
+     Creates a new fltk3::GLWindow widget using the given position,
+     size, and label string. The default boxtype is fltk3::NO_BOX. The
+     default mode is fltk3::RGB|fltk3::DOUBLE|fltk3::DEPTH.
+     */
+    
+    GLWindow(int X, int Y, int W, int H, const char *l=0)
+    : fltk3::Window(X,Y,W,H,l) {init();}
+    
+  protected:
+    /**
+     Draws the fltk3::GLWindow.
+     
+     You \e \b must override the draw() method.
+     */
+    virtual void draw();
+  };
+  
+}
+
+#endif
+
+//
+// End of "$Id: GLWindow.h 8157 2011-01-01 14:01:53Z AlbrechtS $".
+//

Deleted: branches/branch-3.0/include/fltk3gl/GL_Window.h

Modified: branches/branch-3.0/include/fltk3gl/all.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/all.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3gl/all.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -31,7 +31,7 @@
 #include "gl.h"
 #include "glu.h"
 #include "glut.h"
-#include "GlWindow.h"
+#include "GLWindow.h"
 #include "glDraw.h"
 
 #endif // !FLTK3GLALL_H

Modified: branches/branch-3.0/include/fltk3gl/gl.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/gl.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3gl/gl.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -51,7 +51,7 @@
 #ifndef FLtk3_gl_H
 #  define FLtk3_gl_H
 
-#  include "enumerations.h" // for color names
+#  include <fltk3/enumerations.h> // for color names
 #  ifdef WIN32
 #    include <windows.h>
 #  endif

Deleted: branches/branch-3.0/include/fltk3gl/gl2opengl.h

Modified: branches/branch-3.0/include/fltk3gl/glu.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/glu.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3gl/glu.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -35,7 +35,7 @@
 #ifndef FLtk3_glu_H
 #  define FLtk3_glu_H
 
-#  include "enumerations.h" // for color names
+#  include <fltk3/enumerations.h> // for color names
 #  ifdef WIN32
 #    include <windows.h>
 #  endif

Modified: branches/branch-3.0/include/fltk3gl/glut.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/glut.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/include/fltk3gl/glut.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -42,8 +42,8 @@
 
 #include "gl.h"
 
-#include "run.h"
-#include "GlWindow.h"
+#include <fltk3/run.h>
+#include "GLWindow.h"
 
 class Fl_Glut_Window;
 
@@ -53,7 +53,7 @@
    GLUT is emulated using this window class and these static variables
    (plus several more static variables hidden in glut_compatability.cxx):
    */
-  class FLTK3_EXPORT GlutWindow : public GlWindow {
+  class FLTK3_EXPORT GlutWindow : public GLWindow {
 
     friend class ::Fl_Glut_Window;
 

Modified: branches/branch-3.0/src/CMakeLists.txt
===================================================================
--- branches/branch-3.0/src/CMakeLists.txt	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/CMakeLists.txt	2011-08-25 11:40:26 UTC (rev 9010)
@@ -1,455 +1,3 @@
 include_regular_expression("[.][cxx|c|h]$")
 
 set(CPPFILES
-  Fl.cxx
-  Fl_Adjuster.cxx
-  Fl_Bitmap.cxx
-  Fl_Box.cxx
-  Fl_Browser.cxx
-  Fl_Browser_.cxx
-  Fl_Browser_load.cxx
-  Fl_Button.cxx
-  Fl_Chart.cxx
-  Fl_Check_Browser.cxx
-  Fl_Check_Button.cxx
-  Fl_Choice.cxx
-  Fl_Clock.cxx
-  Fl_Color_Chooser.cxx
-  Fl_Counter.cxx
-  Fl_Device.cxx
-  Fl_Dial.cxx
-  Fl_Double_Window.cxx
-  Fl_File_Browser.cxx
-  Fl_File_Chooser.cxx
-  Fl_File_Chooser2.cxx
-  Fl_File_Icon.cxx
-  Fl_File_Input.cxx
-  Fl_Group.cxx
-  Fl_Help_View.cxx
-  Fl_Image.cxx
-  Fl_Input.cxx
-  Fl_Input_.cxx
-  Fl_Light_Button.cxx
-  Fl_Menu.cxx
-  Fl_Menu_.cxx
-  Fl_Menu_Bar.cxx
-  Fl_Menu_Button.cxx
-  Fl_Menu_Window.cxx
-  Fl_Menu_add.cxx
-  Fl_Menu_global.cxx
-  Fl_Multi_Label.cxx
-  Fl_Native_File_Chooser.cxx
-  Fl_Overlay_Window.cxx
-  Fl_Pack.cxx
-  Fl_Paged_Device.cxx
-  Fl_Pixmap.cxx
-  Fl_Positioner.cxx
-  Fl_Printer.cxx
-  Fl_Preferences.cxx
-  Fl_Progress.cxx
-  Fl_Repeat_Button.cxx
-  Fl_Return_Button.cxx
-  Fl_Roller.cxx
-  Fl_Round_Button.cxx
-  Fl_Scroll.cxx
-  Fl_Scrollbar.cxx
-  Fl_Shared_Image.cxx
-  Fl_Single_Window.cxx
-  Fl_Slider.cxx
-  Style.cxx
-  Fl_Sys_Menu_Bar.cxx
-  Fl_Table.cxx
-  Fl_Table_Row.cxx
-  Fl_Tabs.cxx
-  Fl_Text_Buffer.cxx
-  Fl_Text_Display.cxx
-  Fl_Text_Editor.cxx
-  Fl_Tile.cxx
-  Fl_Tiled_Image.cxx
-  Fl_Tooltip.cxx
-  Fl_Tree.cxx
-  Fl_Tree_Item.cxx
-  Fl_Tree_Item_Array.cxx
-  Fl_Tree_Prefs.cxx
-  Fl_Valuator.cxx
-  Fl_Value_Input.cxx
-  Fl_Value_Output.cxx
-  Fl_Value_Slider.cxx
-  Fl_Widget.cxx
-  Fl_Window.cxx
-  Fl_Window_fullscreen.cxx
-  Fl_Window_hotspot.cxx
-  Fl_Window_iconize.cxx
-  Fl_Wizard.cxx
-  Fl_XBM_Image.cxx
-  Fl_XPM_Image.cxx
-  Fl_abort.cxx
-  Fl_add_idle.cxx
-  Fl_arg.cxx
-  Fl_compose.cxx
-  Fl_display.cxx
-  Fl_get_key.cxx
-  Fl_get_system_colors.cxx
-  Fl_grab.cxx
-  Fl_lock.cxx
-  Fl_own_colormap.cxx
-  Fl_visual.cxx
-  Fl_x.cxx
-  filename_absolute.cxx
-  filename_expand.cxx
-  filename_ext.cxx
-  filename_isdir.cxx
-  filename_list.cxx
-  filename_match.cxx
-  filename_setext.cxx
-  fl_arc.cxx
-  fl_arci.cxx
-  fl_ask.cxx
-  fl_boxtype.cxx
-  fl_call_main.cxx
-  fl_color.cxx
-  fl_cursor.cxx
-  fl_curve.cxx
-  fl_diamond_box.cxx
-  fl_dnd.cxx
-  fl_draw.cxx
-  fl_draw_image.cxx
-  fl_draw_pixmap.cxx
-  fl_encoding_latin1.cxx
-  fl_encoding_mac_roman.cxx
-  fl_engraved_label.cxx
-  fl_file_dir.cxx
-  fl_font.cxx
-  fl_gtk.cxx
-  fl_labeltype.cxx
-  fl_line_style.cxx
-  fl_open_uri.cxx
-  fl_oval_box.cxx
-  fl_overlay.cxx
-  fl_overlay_visual.cxx
-  fl_plastic.cxx
-  fl_read_image.cxx
-  fl_rect.cxx
-  fl_round_box.cxx
-  fl_rounded_box.cxx
-  fl_scroll_area.cxx
-  fl_set_font.cxx
-  fl_set_fonts.cxx
-  fl_shadow_box.cxx
-  fl_shortcut.cxx
-  fl_show_colormap.cxx
-  fl_symbols.cxx
-  fl_utf8.cxx
-  fl_utf.cxx
-  fl_vertex.cxx
-  numericsort.cxx
-  ps_image.cxx
-  scandir.cxx
-  screen_xywh.cxx
-)
-
-set(FLCPPFILES
-  forms_compatability.cxx
-  forms_bitmap.cxx
-  forms_free.cxx
-  forms_fselect.cxx
-  forms_pixmap.cxx
-  forms_timer.cxx
-)
-
-set(GLCPPFILES
-  Fl_Gl_Choice.cxx
-  Fl_Gl_Device_Plugin.cxx
-  Fl_Gl_Overlay.cxx
-  Fl_Gl_Window.cxx
-  freeglut_geometry.cxx
-  freeglut_stroke_mono_roman.cxx
-  freeglut_stroke_roman.cxx
-  freeglut_teapot.cxx
-  gl_draw.cxx
-  gl_start.cxx
-  glut_compatability.cxx
-  glut_font.cxx
-)
-
-set(IMGCPPFILES
-  fl_images_core.cxx
-  Fl_BMP_Image.cxx
-  Fl_File_Icon2.cxx
-  Fl_GIF_Image.cxx
-  Fl_Help_Dialog.cxx
-  Fl_JPEG_Image.cxx
-  Fl_PNG_Image.cxx
-  Fl_PNM_Image.cxx
-)
-
-set(CFILES
-  flstring.c
-  vsnprintf.c
-  xutf8/case.c
-  xutf8/is_right2left.c
-  xutf8/is_spacing.c
-  xutf8/keysym2Ucs.c
-  xutf8/utf8Input.c
-  xutf8/utf8Utils.c
-  xutf8/utf8Wrap.c
-)
-
-add_definitions(-DFL_LIBRARY)
-if(APPLE)
-	set(MMFILES
-		Fl_cocoa.mm
-		Fl_Native_File_Chooser_MAC.mm
-		Fl_Quartz_Printer.mm
-		)
-else()
-   set(MMFILES
-      )
-endif(APPLE)
-
-#######################################################################
-add_library(fltk STATIC ${CPPFILES} ${MMFILES} ${CFILES} fl_call_main.c)
-set_target_properties(fltk PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-if(MSVC)
-   if(OPTION_LARGE_FILE)
-      set_target_properties(fltk PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-   endif()
-   set_target_properties(fltk
-      PROPERTIES
-         OUTPUT_NAME fltk
-         DEBUG_OUTPUT_NAME fltkd
-   )
-endif(MSVC)
-
-if(USE_THREADS)
-   target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
-endif(USE_THREADS)
-
-if(USE_X11)
-   target_link_libraries(fltk ${X11_LIBRARIES})
-endif(USE_X11)
-
-if(WIN32)
-   target_link_libraries(fltk comctl32)
-endif(WIN32)
-
-if(FLTK_HAVE_CAIRO)
-   target_link_libraries(fltk fltk_cairo ${PKG_CAIRO_LIBRARIES})
-ENDif(FLTK_HAVE_CAIRO)
-
-if(HAVE_XINERAMA)
-   target_link_libraries(fltk ${X11_Xinerama_LIB})
-endif(HAVE_XINERAMA)
-
-if(USE_XFT)
-   target_link_libraries(fltk ${X11_Xft_LIB})
-endif(USE_XFT)
-
-if(LIB_fontconfig)
-   target_link_libraries(fltk ${LIB_fontconfig})
-endif(LIB_fontconfig)
-
-#######################################################################
-add_library(fltk_forms STATIC ${FLCPPFILES})
-target_link_libraries(fltk_forms fltk)
-set_target_properties(fltk_forms
-   PROPERTIES CLEAN_DIRECT_OUTPUT 1
-)
-if(MSVC)
-   if(OPTION_LARGE_FILE)
-      set_target_properties(fltk_forms PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-   endif()
-   set_target_properties(fltk_forms
-      PROPERTIES
-         OUTPUT_NAME fltkforms
-         DEBUG_OUTPUT_NAME fltkformsd
-   )
-endif(MSVC)
-
-#######################################################################
-add_library(fltk_images STATIC ${IMGCPPFILES})
-target_link_libraries(fltk_images fltk ${FLTK_PNG_LIBRARIES}
-     ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES})
-set_target_properties(fltk_images PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-if(MSVC)
-   if(OPTION_LARGE_FILE)
-      set_target_properties(fltk_images PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-   endif()
-   set_target_properties(fltk_images
-      PROPERTIES
-         OUTPUT_NAME fltkimages
-         DEBUG_OUTPUT_NAME fltkimagesd
-   )
-endif(MSVC)
-
-#######################################################################
-install(TARGETS fltk fltk_forms fltk_images
-   EXPORT fltk-install
-   DESTINATION ${PREFIX_LIB}
-)
-
-#######################################################################
-if(OPENGL_FOUND)
-   add_library(fltk_gl STATIC ${GLCPPFILES})
-   target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
-   set_target_properties(fltk_gl PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   if(MSVC)
-      if(OPTION_LARGE_FILE)
-         set_target_properties(fltk_gl PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-      endif()
-      set_target_properties(fltk_gl
-         PROPERTIES
-            OUTPUT_NAME fltkgl
-            DEBUG_OUTPUT_NAME fltkgld
-      )
-   endif(MSVC)
-
-   install(TARGETS fltk_gl
-      EXPORT fltk-install
-      DESTINATION ${PREFIX_LIB}
-   )
-endif(OPENGL_FOUND)
-
-#######################################################################
-#######################################################################
-if(OPTION_BUILD_SHARED_LIBS)
-
-#######################################################################
-add_library(fltk_SHARED SHARED ${CPPFILES} ${MMFILES} ${CFILES})
-set_target_properties(fltk_SHARED
-   PROPERTIES CLEAN_DIRECT_OUTPUT 1
-   VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-   SOVERSION ${FLTK_VERSION_PATCH}
-)
-if(MSVC)
-   set_target_properties(fltk_SHARED
-      PROPERTIES
-         OUTPUT_NAME fltkdll
-         DEBUG_OUTPUT_NAME fltkdlld
-         COMPILE_DEFINITIONS "FL_DLL;FL_LIBRARY"
-   )
-   if(OPTION_LARGE_FILE)
-      set_target_properties(fltk_SHARED PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-   endif(OPTION_LARGE_FILE)
-else()
-   set_target_properties(fltk_SHARED PROPERTIES OUTPUT_NAME fltk)
-endif(MSVC)
-
-if(USE_THREADS)
-   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
-endif(USE_THREADS)
-
-if(USE_X11)
-   target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
-endif(USE_X11)
-
-if(WIN32)
-   target_link_libraries(fltk_SHARED comctl32)
-endif(WIN32)
-
-if(FLTK_HAVE_CAIRO)
-   target_link_libraries(fltk_SHARED fltk_cairo ${PKG_CAIRO_LIBRARIES})
-ENDif(FLTK_HAVE_CAIRO)
-
-if(HAVE_XINERAMA)
-   target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB})
-endif(HAVE_XINERAMA)
-
-if(USE_XFT)
-   target_link_libraries(fltk_SHARED ${X11_Xft_LIB})
-endif(USE_XFT)
-
-if(LIB_fontconfig)
-   target_link_libraries(fltk_SHARED ${LIB_fontconfig})
-endif(LIB_fontconfig)
-
-#######################################################################
-add_library(fltk_forms_SHARED SHARED ${FLCPPFILES})
-target_link_libraries(fltk_forms_SHARED fltk)
-set_target_properties(fltk_forms_SHARED
-   PROPERTIES CLEAN_DIRECT_OUTPUT 1
-   VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-   SOVERSION ${FLTK_VERSION_PATCH}
-)
-if(MSVC)
-   set_target_properties(fltk_forms_SHARED
-      PROPERTIES
-         OUTPUT_NAME fltkformsdll
-         DEBUG_OUTPUT_NAME fltkformsdlld
-         COMPILE_DEFINITIONS "FL_DLL;FL_LIBRARY"
-   )
-   if(OPTION_LARGE_FILE)
-      set_target_properties(fltk_forms_SHARED PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-   endif(OPTION_LARGE_FILE)
-else()
-   set_target_properties(fltk_forms_SHARED PROPERTIES OUTPUT_NAME fltk_forms)
-endif(MSVC)
-
-if(USE_THREADS)
-   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
-endif(USE_THREADS)
-
-if(USE_X11)
-   target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
-endif(USE_X11)
-
-#######################################################################
-add_library(fltk_images_SHARED SHARED ${IMGCPPFILES})
-target_link_libraries(fltk_images_SHARED fltk
-   ${FLTK_PNG_LIBRARIES} ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES}
-)
-set_target_properties(fltk_images_SHARED
-   PROPERTIES CLEAN_DIRECT_OUTPUT 1
-   VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-   SOVERSION ${FLTK_VERSION_PATCH}
-)
-if(MSVC)
-   set_target_properties(fltk_images_SHARED
-      PROPERTIES
-         OUTPUT_NAME fltkimagesdll
-         DEBUG_OUTPUT_NAME fltkimagesdlld
-         COMPILE_DEFINITIONS "FL_DLL;FL_LIBRARY"
-   )
-   if(OPTION_LARGE_FILE)
-      set_target_properties(fltk_images_SHARED PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-   endif(OPTION_LARGE_FILE)
-else()
-   set_target_properties(fltk_images_SHARED PROPERTIES OUTPUT_NAME fltk_images)
-endif(MSVC)
-
-#######################################################################
-install(TARGETS fltk_SHARED fltk_forms_SHARED fltk_images_SHARED
-   EXPORT fltk-install
-   DESTINATION ${PREFIX_LIB}
-)
-
-#######################################################################
-if(OPENGL_FOUND)
-   add_library(fltk_gl_SHARED SHARED ${GLCPPFILES})
-   target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
-   set_target_properties(fltk_gl_SHARED
-      PROPERTIES CLEAN_DIRECT_OUTPUT 1
-      VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-      SOVERSION ${FLTK_VERSION_PATCH}
-   )
-   if(MSVC)
-      set_target_properties(fltk_gl_SHARED
-         PROPERTIES
-            OUTPUT_NAME fltkgldll
-            DEBUG_OUTPUT_NAME fltkgldlld
-            COMPILE_DEFINITIONS "FL_DLL;FL_LIBRARY"
-      )
-      if(OPTION_LARGE_FILE)
-         set_target_properties(fltk_gl_SHARED PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE)
-      endif(OPTION_LARGE_FILE)
-   else()
-      set_target_properties(fltk_gl_SHARED PROPERTIES OUTPUT_NAME fltk_gl)
-   endif(MSVC)
-
-   install(TARGETS fltk_gl_SHARED
-      EXPORT fltk-install
-      DESTINATION ${PREFIX_LIB}
-   )
-endif(OPENGL_FOUND)
-
-endif(OPTION_BUILD_SHARED_LIBS)

Modified: branches/branch-3.0/src/Makefile
===================================================================
--- branches/branch-3.0/src/Makefile	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/Makefile	2011-08-25 11:40:26 UTC (rev 9010)
@@ -26,7 +26,7 @@
 #
 
 FLTK3_CPPFILES = \
-	core/Fl.cxx \
+	fltk3/run.cxx \
 	core/Fl_Adjuster.cxx \
 	core/Fl_Bitmap.cxx \
 	core/Fl_Box.cxx \
@@ -173,17 +173,18 @@
 	core/screen_xywh.cxx
 
 FLTK3GL_CPPFILES = \
-	core/Fl_Gl_Choice.cxx \
-	core/Fl_Gl_Device_Plugin.cxx \
-	core/Fl_Gl_Overlay.cxx \
-	core/Fl_Gl_Window.cxx \
-	core/freeglut_geometry.cxx \
-	core/freeglut_stroke_mono_roman.cxx \
-	core/freeglut_stroke_roman.cxx \
-	core/freeglut_teapot.cxx \
-	core/gl_draw.cxx \
-	core/glut_compatability.cxx \
-	core/glut_font.cxx
+	fltk3gl/GLChoice.cxx \
+	fltk3gl/GLDevicePlugin.cxx \
+	fltk3gl/GLOverlay.cxx \
+	fltk3gl/GLWindow.cxx \
+	fltk3gl/freeglut_geometry.cxx \
+	fltk3gl/freeglut_stroke_mono_roman.cxx \
+	fltk3gl/freeglut_stroke_roman.cxx \
+	fltk3gl/freeglut_teapot.cxx \
+	fltk3gl/gl_draw.cxx \
+	fltk3gl/gl_start.cxx \
+	fltk3gl/glut_compatability.cxx \
+	fltk3gl/glut_font.cxx
 
 FLTK3IMAGES_CPPFILES = \
 	core/Fl_BMP_Image.cxx \
@@ -212,86 +213,86 @@
 	core/xutf8/utf8Wrap.c
 
 FLTK3PNG_CFILES = \
-	png/png.c \
-	png/pngerror.c \
-	png/pngget.c \
-	png/pngmem.c \
-	png/pngpread.c \
-	png/pngread.c \
-	png/pngrio.c \
-	png/pngrtran.c \
-	png/pngrutil.c \
-	png/pngset.c \
-	png/pngtrans.c \
-	png/pngwio.c \
-	png/pngwrite.c \
-	png/pngwtran.c \
-	png/pngwutil.c
+	fltk3png/png.c \
+	fltk3png/pngerror.c \
+	fltk3png/pngget.c \
+	fltk3png/pngmem.c \
+	fltk3png/pngpread.c \
+	fltk3png/pngread.c \
+	fltk3png/pngrio.c \
+	fltk3png/pngrtran.c \
+	fltk3png/pngrutil.c \
+	fltk3png/pngset.c \
+	fltk3png/pngtrans.c \
+	fltk3png/pngwio.c \
+	fltk3png/pngwrite.c \
+	fltk3png/pngwtran.c \
+	fltk3png/pngwutil.c
 
 FLTK3JPEG_CFILES = \
-	jpeg/jaricom.c \
-	jpeg/jcarith.c \
-	jpeg/jdarith.c \
-	jpeg/jcapimin.c \
-	jpeg/jcapistd.c \
-	jpeg/jccoefct.c \
-	jpeg/jccolor.c \
-	jpeg/jcdctmgr.c \
-	jpeg/jchuff.c \
-	jpeg/jcinit.c \
-	jpeg/jcmainct.c \
-	jpeg/jcmarker.c \
-	jpeg/jcmaster.c \
-	jpeg/jcomapi.c \
-	jpeg/jcparam.c \
-	jpeg/jcprepct.c \
-	jpeg/jcsample.c \
-	jpeg/jctrans.c \
-	jpeg/jdapimin.c \
-	jpeg/jdapistd.c \
-	jpeg/jdatadst.c \
-	jpeg/jdatasrc.c \
-	jpeg/jdcoefct.c \
-	jpeg/jdcolor.c \
-	jpeg/jddctmgr.c \
-	jpeg/jdhuff.c \
-	jpeg/jdinput.c \
-	jpeg/jdmainct.c \
-	jpeg/jdmarker.c \
-	jpeg/jdmaster.c \
-	jpeg/jdmerge.c \
-	jpeg/jdpostct.c \
-	jpeg/jdsample.c \
-	jpeg/jdtrans.c \
-	jpeg/jerror.c \
-	jpeg/jfdctflt.c \
-	jpeg/jfdctfst.c \
-	jpeg/jfdctint.c \
-	jpeg/jidctflt.c \
-	jpeg/jidctfst.c \
-	jpeg/jidctint.c \
-	jpeg/jmemmgr.c \
-	jpeg/jmemnobs.c \
-	jpeg/jquant1.c \
-	jpeg/jquant2.c \
-	jpeg/jutils.c
+	fltk3jpeg/jaricom.c \
+	fltk3jpeg/jcarith.c \
+	fltk3jpeg/jdarith.c \
+	fltk3jpeg/jcapimin.c \
+	fltk3jpeg/jcapistd.c \
+	fltk3jpeg/jccoefct.c \
+	fltk3jpeg/jccolor.c \
+	fltk3jpeg/jcdctmgr.c \
+	fltk3jpeg/jchuff.c \
+	fltk3jpeg/jcinit.c \
+	fltk3jpeg/jcmainct.c \
+	fltk3jpeg/jcmarker.c \
+	fltk3jpeg/jcmaster.c \
+	fltk3jpeg/jcomapi.c \
+	fltk3jpeg/jcparam.c \
+	fltk3jpeg/jcprepct.c \
+	fltk3jpeg/jcsample.c \
+	fltk3jpeg/jctrans.c \
+	fltk3jpeg/jdapimin.c \
+	fltk3jpeg/jdapistd.c \
+	fltk3jpeg/jdatadst.c \
+	fltk3jpeg/jdatasrc.c \
+	fltk3jpeg/jdcoefct.c \
+	fltk3jpeg/jdcolor.c \
+	fltk3jpeg/jddctmgr.c \
+	fltk3jpeg/jdhuff.c \
+	fltk3jpeg/jdinput.c \
+	fltk3jpeg/jdmainct.c \
+	fltk3jpeg/jdmarker.c \
+	fltk3jpeg/jdmaster.c \
+	fltk3jpeg/jdmerge.c \
+	fltk3jpeg/jdpostct.c \
+	fltk3jpeg/jdsample.c \
+	fltk3jpeg/jdtrans.c \
+	fltk3jpeg/jerror.c \
+	fltk3jpeg/jfdctflt.c \
+	fltk3jpeg/jfdctfst.c \
+	fltk3jpeg/jfdctint.c \
+	fltk3jpeg/jidctflt.c \
+	fltk3jpeg/jidctfst.c \
+	fltk3jpeg/jidctint.c \
+	fltk3jpeg/jmemmgr.c \
+	fltk3jpeg/jmemnobs.c \
+	fltk3jpeg/jquant1.c \
+	fltk3jpeg/jquant2.c \
+	fltk3jpeg/jutils.c
 
 FLTK3ZLIB_CFILES = \
-	zlib/adler32.c \
-	zlib/compress.c \
-	zlib/crc32.c \
-	zlib/deflate.c \
-	zlib/gzclose.c \
-	zlib/gzlib.c \
-	zlib/gzread.c \
-	zlib/gzwrite.c \
-	zlib/infback.c \
-	zlib/inffast.c \
-	zlib/inflate.c \
-	zlib/inftrees.c \
-	zlib/trees.c \
-	zlib/uncompr.c \
-	zlib/zutil.c
+	fltk3zlib/adler32.c \
+	fltk3zlib/compress.c \
+	fltk3zlib/crc32.c \
+	fltk3zlib/deflate.c \
+	fltk3zlib/gzclose.c \
+	fltk3zlib/gzlib.c \
+	fltk3zlib/gzread.c \
+	fltk3zlib/gzwrite.c \
+	fltk3zlib/infback.c \
+	fltk3zlib/inffast.c \
+	fltk3zlib/inflate.c \
+	fltk3zlib/inftrees.c \
+	fltk3zlib/trees.c \
+	fltk3zlib/uncompr.c \
+	fltk3zlib/zutil.c
 
 ################################################################
 FLTKFLAGS = -DFL_LIBRARY
@@ -515,7 +516,7 @@
 			$(IMAGELIBS) $(LDLIBS)
 
 clean:
-	-$(RM) *.o xutf8/*.o *.dll.a core.* *~ *.bak *.bck
+	-$(RM) *.o */*.o */*/*.o *.dll.a core.* *~ *.bak *.bck
 	-$(RM) $(FLTK3_DSONAME) $(FLTK3GL_DSONAME) $(FLTK3IMAGES_DSONAME) \
 		$(FLTK3_LIBNAME) $(FLTK3GL_LIBNAME) \
 		$(FLTK3IMAGES_LIBNAME) \

Modified: branches/branch-3.0/src/core/Fl_cocoa.mm
===================================================================
--- branches/branch-3.0/src/core/Fl_cocoa.mm	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/core/Fl_cocoa.mm	2011-08-25 11:40:26 UTC (rev 9010)
@@ -3459,7 +3459,7 @@
  Supports old Mac OS X versions that may use a couple of Carbon calls:
  GetKeys used by OS X 10.3 or before (in fltk3::get_key())
  PMSessionPageSetupDialog and PMSessionPrintDialog used by 10.4 or before (in fltk3::Printer::start_job())
- GetWindowPort used by 10.4 or before (in fltk3::GlChoice.cxx)
+ GetWindowPort used by 10.4 or before (in fltk3::GLChoice.cxx)
  */
 void *Fl_X::get_carbon_function(const char *function_name) {
   static void *carbon = NULL;

Deleted: branches/branch-3.0/src/core/freeglut_teapot_data.h

Copied: branches/branch-3.0/src/fltk3gl/GLChoice.cxx (from rev 9009, branches/branch-3.0/src/fltk3gl/GL_Choice.cxx)
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLChoice.cxx	                        (rev 0)
+++ branches/branch-3.0/src/fltk3gl/GLChoice.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,426 @@
+//
+// "$Id$"
+//
+// OpenGL visual selection code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <config.h>
+#if HAVE_GL
+
+#  include <fltk3/run.h>
+#  include <fltk3/x.h>
+#  include <stdlib.h>
+#  include "GLChoice.H"
+#  include <fltk3gl/glDraw.h>
+#  include "../core/flstring.h"
+#  include <fltk3/utf8.h>
+
+#  ifdef __APPLE__
+#    include <ApplicationServices/ApplicationServices.h>
+#    include <fltk3/Window.h>
+#  endif
+
+#  ifdef WIN32
+void fl_save_dc(HWND, HDC);
+#  endif
+
+static fltk3::GLChoice *first;
+
+// this assumes one of the two arguments is zero:
+// We keep the list system in Win32 to stay compatible and interpret
+// the list later...
+fltk3::GLChoice *fltk3::GLChoice::find(int m, const int *alistp) {
+  fltk3::GLChoice *g;
+  
+  for (g = first; g; g = g->next)
+    if (g->mode == m && g->alist == alistp) 
+      return g;
+
+#if defined(USE_X11)    
+  const int *blist;
+  int list[32];
+    
+  if (alistp)
+    blist = alistp;
+  else {
+    int n = 0;
+    if (m & fltk3::INDEX) {
+      list[n++] = GLX_BUFFER_SIZE;
+      list[n++] = 8; // glut tries many sizes, but this should work...
+    } else {
+      list[n++] = GLX_RGBA;
+      list[n++] = GLX_GREEN_SIZE;
+      list[n++] = (m & fltk3::RGB8) ? 8 : 1;
+      if (m & fltk3::ALPHA) {
+	list[n++] = GLX_ALPHA_SIZE;
+	list[n++] = (m & fltk3::RGB8) ? 8 : 1;
+      }
+      if (m & fltk3::ACCUM) {
+	list[n++] = GLX_ACCUM_GREEN_SIZE;
+	list[n++] = 1;
+	if (m & fltk3::ALPHA) {
+	  list[n++] = GLX_ACCUM_ALPHA_SIZE;
+	  list[n++] = 1;
+	}
+      }
+    }
+    if (m & fltk3::DOUBLE) {
+      list[n++] = GLX_DOUBLEBUFFER;
+    }
+    if (m & fltk3::DEPTH) {
+      list[n++] = GLX_DEPTH_SIZE; list[n++] = 1;
+    }
+    if (m & fltk3::STENCIL) {
+      list[n++] = GLX_STENCIL_SIZE; list[n++] = 1;
+    }
+    if (m & fltk3::STEREO) {
+      list[n++] = GLX_STEREO;
+    }
+#    if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
+    if (m & fltk3::MULTISAMPLE) {
+      list[n++] = GLX_SAMPLES_SGIS;
+      list[n++] = 4; // value Glut uses
+    }
+#    endif
+    list[n] = 0;
+    blist = list;
+  }
+    
+  fl_open_display();
+  XVisualInfo *visp = glXChooseVisual(fl_display, fl_screen, (int *)blist);
+  if (!visp) {
+#    if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
+    if (m&fltk3::MULTISAMPLE) return find(m&~fltk3::MULTISAMPLE,0);
+#    endif
+    return 0;
+  }
+
+#elif defined(__APPLE_QUARTZ__)
+  // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+  const int *blist;
+  int list[32];
+   
+  if (alistp)
+    blist = alistp;
+  else {
+    int n = 0;
+    if (m & fltk3::INDEX) {
+      list[n++] = AGL_BUFFER_SIZE;
+      list[n++] = 8; // glut tries many sizes, but this should work...
+    } else {
+      list[n++] = AGL_RGBA;
+      list[n++] = AGL_GREEN_SIZE;
+      list[n++] = (m & fltk3::RGB8) ? 8 : 1;
+      if (m & fltk3::ALPHA) {
+        list[n++] = AGL_ALPHA_SIZE;
+        list[n++] = (m & fltk3::RGB8) ? 8 : 1;
+      }
+      if (m & fltk3::ACCUM) {
+        list[n++] = AGL_ACCUM_GREEN_SIZE;
+        list[n++] = 1;
+        if (m & fltk3::ALPHA) {
+          list[n++] = AGL_ACCUM_ALPHA_SIZE;
+          list[n++] = 1;
+        }
+      }
+    }
+    if (m & fltk3::DOUBLE) {
+      list[n++] = AGL_DOUBLEBUFFER;
+    }
+    if (m & fltk3::DEPTH) {
+      list[n++] = AGL_DEPTH_SIZE; list[n++] = 24;
+    }
+    if (m & fltk3::STENCIL) {
+      list[n++] = AGL_STENCIL_SIZE; list[n++] = 1;
+    }
+#    ifdef AGL_STEREO
+    if (m & fltk3::STEREO) {
+      list[n++] = AGL_STEREO;
+    }
+#    endif
+    list[n] = AGL_NONE;
+    blist = list;
+  }
+  fl_open_display();
+  AGLPixelFormat fmt = aglChoosePixelFormat(NULL, 0, (GLint*)blist);
+  if (!fmt) return 0;
+  
+#elif defined(WIN32)
+
+  // Replacement for ChoosePixelFormat() that finds one with an overlay
+  // if possible:
+  if (!fl_gc) fl_GetDC(0);
+  int pixelformat = 0;
+  PIXELFORMATDESCRIPTOR chosen_pfd;
+  for (int i = 1; ; i++) {
+    PIXELFORMATDESCRIPTOR pfd;
+    if (!DescribePixelFormat(fl_gc, i, sizeof(pfd), &pfd)) break;
+    // continue if it does not satisfy our requirements:
+    if (~pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL)) continue;
+    if (pfd.iPixelType != ((m&fltk3::INDEX)?PFD_TYPE_COLORINDEX:PFD_TYPE_RGBA)) continue;
+    if ((m & fltk3::ALPHA) && !pfd.cAlphaBits) continue;
+    if ((m & fltk3::ACCUM) && !pfd.cAccumBits) continue;
+    if ((!(m & fltk3::DOUBLE)) != (!(pfd.dwFlags & PFD_DOUBLEBUFFER))) continue;
+    if ((!(m & fltk3::STEREO)) != (!(pfd.dwFlags & PFD_STEREO))) continue;
+    if ((m & fltk3::DEPTH) && !pfd.cDepthBits) continue;
+    if ((m & fltk3::STENCIL) && !pfd.cStencilBits) continue;
+    // see if better than the one we have already:
+    if (pixelformat) {
+      // offering non-generic rendering is better (read: hardware accelleration)
+      if (!(chosen_pfd.dwFlags & PFD_GENERIC_FORMAT) &&
+          (pfd.dwFlags & PFD_GENERIC_FORMAT)) continue;
+      // offering overlay is better:
+      else if (!(chosen_pfd.bReserved & 15) && (pfd.bReserved & 15)) {}
+      // otherwise more bit planes is better:
+      else if (chosen_pfd.cColorBits > pfd.cColorBits) continue;
+      else if (chosen_pfd.cDepthBits > pfd.cDepthBits) continue;
+    }
+    pixelformat = i;
+    chosen_pfd = pfd;
+  }
+  //printf("Chosen pixel format is %d\n", pixelformat);
+  if (!pixelformat) return 0;
+#else
+# error platform unsupported
+#endif
+
+  g = new fltk3::GLChoice;
+  g->mode = m;
+  g->alist = alistp;
+  g->next = first;
+  first = g;
+
+#if defined(USE_X11)
+  g->vis = visp;
+
+  if (/*MaxCmapsOfScreen(ScreenOfDisplay(fl_display,fl_screen))==1 && */
+      visp->visualid == fl_visual->visualid &&
+      !fltk3::getenv("MESA_PRIVATE_CMAP"))
+    g->colormap = fl_colormap;
+  else
+    g->colormap = XCreateColormap(fl_display, RootWindow(fl_display,fl_screen),
+				  visp->visual, AllocNone);
+#  elif defined(WIN32)
+  g->pixelformat = pixelformat;
+  g->pfd = chosen_pfd;
+#  elif defined(__APPLE_QUARTZ__)
+  // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+  g->pixelformat = fmt;
+#  else
+#    error unsupported platform
+#  endif
+
+  return g;
+}
+
+static GLContext *context_list = 0;
+static int nContext = 0, NContext = 0;
+
+static void add_context(GLContext ctx) {
+  if (!ctx) return;
+  if (nContext==NContext) {
+    if (!NContext) NContext = 8;
+    NContext *= 2;
+    context_list = (GLContext*)realloc(
+      context_list, NContext*sizeof(GLContext));
+  }
+  context_list[nContext++] = ctx;
+}
+
+static void del_context(GLContext ctx) {
+  int i; 
+  for (i=0; i<nContext; i++) {
+    if (context_list[i]==ctx) {
+      memmove(context_list+i, context_list+i+1,
+        (nContext-i-1) * sizeof(GLContext));
+      context_list[--nContext] = 0;
+      break;
+    }
+  }
+  if (!nContext) gl_remove_displaylist_fonts();
+}
+
+#if defined(USE_X11)
+
+GLContext fl_create_gl_context(XVisualInfo* vis) {
+  GLContext shared_ctx = 0;
+  if (context_list && nContext) shared_ctx = context_list[0];
+  GLContext context = glXCreateContext(fl_display, vis, shared_ctx, 1);
+  if (context)
+    add_context(context);
+  return context;
+}
+
+#elif defined(WIN32)
+
+GLContext fl_create_gl_context(fltk3::Window* window, const fltk3::GLChoice* g, int layer) {
+  Fl_X* i = Fl_X::i(window);
+  HDC hdc = i->private_dc;
+  if (!hdc) {
+    hdc = i->private_dc = GetDCEx(i->xid, 0, DCX_CACHE);
+    fl_save_dc(i->xid, hdc);
+    SetPixelFormat(hdc, g->pixelformat, (PIXELFORMATDESCRIPTOR*)(&g->pfd));
+#    if USE_COLORMAP
+    if (fl_palette) SelectPalette(hdc, fl_palette, FALSE);
+#    endif
+  }
+  GLContext context =
+    layer ? wglCreateLayerContext(hdc, layer) : wglCreateContext(hdc);
+  if (context) {
+    if (context_list && nContext) 
+      wglShareLists(context_list[0], context);
+    add_context(context);
+  }
+  return context;
+}
+
+#  elif defined(__APPLE_QUARTZ__)
+#if !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && __LP64__)
+static CGrafPtr fl_GetWindowPort(WindowRef window)
+{
+  typedef CGrafPtr (*wf)(WindowRef);
+  static wf f = NULL;
+  if ( ! f) f = (wf)Fl_X::get_carbon_function("GetWindowPort");
+  return (*f)(window);
+}
+#endif
+
+// warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+GLContext fl_create_gl_context(fltk3::Window* window, const fltk3::GLChoice* g, int layer) {
+  GLContext context, shared_ctx = 0;
+  if (context_list && nContext) shared_ctx = context_list[0];
+  context = aglCreateContext( g->pixelformat, shared_ctx);
+  if (!context) return 0;
+  add_context((GLContext)context);
+  if ( window->parent() ) {
+    int H = window->window()->h();
+    GLint rect[] = { window->x(), H-window->h()-window->y(), window->w(), window->h() };
+    aglSetInteger( (GLContext)context, AGL_BUFFER_RECT, rect );
+    aglEnable( (GLContext)context, AGL_BUFFER_RECT );
+  }
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#if __LP64__
+  // 64 bit version
+  aglSetWindowRef(context, Fl_X::i(window)->window_ref() );
+#else
+  // 32 bit version >= 10.5
+  if (aglSetWindowRef != NULL)
+    aglSetWindowRef(context, Fl_X::i(window)->window_ref() );
+  else
+    aglSetDrawable( context, fl_GetWindowPort( Fl_X::i(window)->window_ref() ) );
+#endif
+#else
+  // 32 bit version < 10.5
+  aglSetDrawable( context, fl_GetWindowPort( Fl_X::i(window)->window_ref() ) );
+#endif
+  return (context);
+}
+#  else
+#    error unsupported platform
+#  endif
+
+static GLContext cached_context;
+static fltk3::Window* cached_window;
+
+void fl_set_gl_context(fltk3::Window* w, GLContext context) {
+  if (context != cached_context || w != cached_window) {
+    cached_context = context;
+    cached_window = w;
+#  if defined(USE_X11)
+    glXMakeCurrent(fl_display, fl_xid(w), context);
+#  elif defined(WIN32)
+    wglMakeCurrent(Fl_X::i(w)->private_dc, context);
+#  elif defined(__APPLE_QUARTZ__)
+    // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+    if ( w->parent() ) { //: resize our GL buffer rectangle
+      int H = w->window()->h();
+      GLint rect[] = { w->x(), H-w->h()-w->y(), w->w(), w->h() };
+      aglSetInteger( context, AGL_BUFFER_RECT, rect );
+      aglEnable( context, AGL_BUFFER_RECT );
+    }
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#if __LP64__
+    // 64 bit version
+    aglSetWindowRef(context, Fl_X::i(w)->window_ref() );
+#else
+    // 32 bit version >= 10.5
+    if (aglSetWindowRef != NULL)
+      aglSetWindowRef(context, Fl_X::i(w)->window_ref() );
+    else
+      aglSetDrawable( context, fl_GetWindowPort( Fl_X::i(w)->window_ref() ) );
+#endif
+#else
+    // 32 bit version < 10.5
+    aglSetDrawable( context, fl_GetWindowPort( Fl_X::i(w)->window_ref() ) );
+#endif
+    aglSetCurrentContext(context);
+#  else
+#   error unsupported platform
+#  endif
+  }
+}
+
+void fl_no_gl_context() {
+  cached_context = 0;
+  cached_window = 0;
+#  if defined(USE_X11)
+  glXMakeCurrent(fl_display, 0, 0);
+#  elif defined(WIN32)
+  wglMakeCurrent(0, 0);
+#  elif defined(__APPLE_QUARTZ__)
+  // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+  AGLContext ctx = aglGetCurrentContext();  
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+  if (aglSetWindowRef != NULL)
+    { if(ctx) aglSetWindowRef(ctx, NULL ); }
+  else
+#endif
+  if(ctx) aglSetDrawable( ctx, NULL );
+  aglSetCurrentContext(0);
+#  else
+#    error unsupported platform
+#  endif
+}
+
+void fl_delete_gl_context(GLContext context) {
+  if (cached_context == context) fl_no_gl_context();
+#  if defined(USE_X11)
+  glXDestroyContext(fl_display, context);
+#  elif defined(WIN32)
+  wglDeleteContext(context);
+#  elif defined(__APPLE_QUARTZ__)
+  // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+  aglDestroyContext( context );
+#  else
+#    error unsupported platform
+#  endif
+  del_context(context);
+}
+
+#endif // HAVE_GL
+
+
+//
+// End of "$Id$".
+//

Copied: branches/branch-3.0/src/fltk3gl/GLChoice.h (from rev 9009, branches/branch-3.0/src/fltk3gl/GL_Choice.h)
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLChoice.h	                        (rev 0)
+++ branches/branch-3.0/src/fltk3gl/GLChoice.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,129 @@
+//
+// "$Id$"
+//
+// OpenGL definitions for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+// Internal interface to set up OpenGL.
+//
+// A "fltk3::GLChoice" is created from an OpenGL mode and holds information
+// necessary to create a window (on X) and to create an OpenGL "context"
+// (on both X and Win32).
+//
+// fl_create_gl_context takes a window (necessary only on Win32) and an
+// fltk3::GLChoice and returns a new OpenGL context. All contexts share
+// display lists with each other.
+//
+// On X another fl_create_gl_context is provided to create it for any
+// X visual.
+//
+// fl_set_gl_context makes the given OpenGL context current and makes
+// it draw into the passed window. It tracks the current one context
+// to avoid calling the context switching code when the same context
+// is used, though it is a mystery to me why the GLX/WGL libraries
+// don't do this themselves...
+//
+// fl_no_gl_context clears that cache so the next fl_set_gl_context is
+// guaranteed to work.
+//
+// fl_delete_gl_context destroys the context.
+//
+// This code is used by fltk3::GlWindow, gl_start(), and gl_visual()
+
+#ifndef Fl_Gl_Choice_H
+#define Fl_Gl_Choice_H
+
+// Warning: whatever GLContext is defined to must take exactly the same
+// space in a structure as a void*!!!
+#ifdef WIN32
+#  include <fltk3/gl.h>
+#  define GLContext HGLRC
+#elif defined(__APPLE_QUARTZ__)
+// warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+#  include <OpenGL/gl.h>
+#  include <AGL/agl.h>
+#  define GLContext AGLContext
+#else
+#  include <GL/glx.h>
+#  define GLContext GLXContext
+#endif
+
+namespace fltk3 {
+  
+  // Describes crap needed to create a GLContext.
+  class GLChoice {
+    int mode;
+    const int *alist;
+    fltk3::GLChoice *next;
+  public:
+#ifdef WIN32
+    int pixelformat;	// the visual to use
+    PIXELFORMATDESCRIPTOR pfd; // some wgl calls need this thing
+#elif defined(__APPLE_QUARTZ__)
+    // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+    AGLPixelFormat pixelformat;
+#else
+    XVisualInfo *vis;	// the visual to use
+    Colormap colormap;	// a colormap for that visual
+#endif
+    // Return one of these structures for a given gl mode.
+    // The second argument is a glX attribute list, and is used if mode is
+    // zero.  This is not supported on Win32:
+    static fltk3::GLChoice *find(int mode, const int *);
+  };
+  
+  class Window;
+
+} // namespace
+
+
+#ifdef WIN32
+  
+  GLContext fl_create_gl_context(fltk3::Window*, const fltk3::GLChoice*, int layer=0);
+  
+#elif defined(__APPLE_QUARTZ__)
+  // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+  
+  GLContext fl_create_gl_context(fltk3::Window*, const fltk3::GLChoice*, int layer=0);
+  
+#else
+  
+  GLContext fl_create_gl_context(XVisualInfo* vis);
+  
+  static inline
+  GLContext fl_create_gl_context(fltk3::Window*, const fltk3::GLChoice* g) {
+    return fl_create_gl_context(g->vis);
+  }
+  
+#endif
+  
+  void fl_set_gl_context(fltk3::Window*, GLContext);
+  void fl_no_gl_context();
+  void fl_delete_gl_context(GLContext);
+  
+#endif
+
+//
+// End of "$Id$".
+//

Copied: branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx (from rev 9009, branches/branch-3.0/src/fltk3gl/GL_DevicePlugin.cxx)
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx	                        (rev 0)
+++ branches/branch-3.0/src/fltk3gl/GLDevicePlugin.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,156 @@
+//
+// "$Id$"
+//
+// implementation of class Fl_Gl_Device_Plugin for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <config.h>
+#include <fltk3/Printer.h>
+#include <fltk3gl/GLWindow.h>
+#include "GLChoice.H"
+#include <fltk3/run.h>
+#ifndef __APPLE__
+#include <fltk3/draw.h>
+#endif
+
+#if defined(__APPLE__)
+static void imgProviderReleaseData (void *info, const void *data, size_t size)
+{
+  free((void *)data);
+}
+#endif
+
+static void print_gl_window(fltk3::GLWindow *glw, int x, int y, int height)
+{
+#ifdef WIN32
+  HDC save_gc = fl_gc;
+  const int bytesperpixel = 3;
+#elif defined(__APPLE__)
+  CGContextRef save_gc = fl_gc;
+  const int bytesperpixel = 4;
+#else
+  _XGC *save_gc = fl_gc;
+  const int bytesperpixel = 3;
+#endif
+  fltk3::SurfaceDevice *save_surface = fltk3::SurfaceDevice::surface();
+  fl_gc = NULL;
+  fltk3::DisplayDevice::display_device()->set_current();
+#ifdef WIN32
+  fltk3::check();
+  fltk3::Window *win = (fltk3::Window*)glw;
+  while( win->window() ) win = win->window();
+  win->redraw();
+  fltk3::check();
+  glw->make_current();
+#else
+  glw->make_current();
+  glw->redraw();
+  glFlush();
+  fltk3::check();
+  glFinish();
+#endif
+  // Read OpenGL context pixels directly.
+  // For extra safety, save & restore OpenGL states that are changed
+  glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+  glPixelStorei(GL_PACK_ALIGNMENT, 4); /* Force 4-byte alignment */
+  glPixelStorei(GL_PACK_ROW_LENGTH, 0);
+  glPixelStorei(GL_PACK_SKIP_ROWS, 0);
+  glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+  // Read a block of pixels from the frame buffer
+  int mByteWidth = glw->w() * bytesperpixel;                
+  mByteWidth = (mByteWidth + 3) & ~3;    // Align to 4 bytes
+  uchar *baseAddress = (uchar*)malloc(mByteWidth * glw->h());
+  glReadPixels(0, 0, glw->w(), glw->h(), 
+#ifdef WIN32
+	       GL_RGB, GL_UNSIGNED_BYTE,
+#elif defined(__APPLE__)
+	       GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+#else // FIXME Linux/Unix
+	       GL_RGB, GL_UNSIGNED_BYTE,
+#endif
+	       baseAddress);
+  glPopClientAttrib();
+  save_surface->set_current();
+  fl_gc = save_gc;
+#if defined(__APPLE__)
+// kCGBitmapByteOrder32Host and CGBitmapInfo are supposed to arrive with 10.4
+// but some 10.4 don't have kCGBitmapByteOrder32Host, so we play a little #define game
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
+#define kCGBitmapByteOrder32Host 0
+#define CGBitmapInfo CGImageAlphaInfo
+#elif ! defined(kCGBitmapByteOrder32Host)
+#ifdef __BIG_ENDIAN__
+#define kCGBitmapByteOrder32Host (4 << 12)
+#else    /* Little endian. */
+#define kCGBitmapByteOrder32Host (2 << 12)
+#endif
+#endif
+  CGColorSpaceRef cSpace = CGColorSpaceCreateDeviceRGB();
+  CGDataProviderRef provider = CGDataProviderCreateWithData(NULL, baseAddress, mByteWidth * glw->h(), imgProviderReleaseData);
+  CGImageRef image = CGImageCreate(glw->w(), glw->h(), 8, 8*bytesperpixel, mByteWidth, cSpace, 
+				   (CGBitmapInfo)(kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host), 
+				   provider, NULL, false, kCGRenderingIntentDefault);
+  if(image == NULL) return;
+  CGContextSaveGState(fl_gc);
+  CGContextTranslateCTM(fl_gc, 0, height);
+  CGContextScaleCTM(fl_gc, 1.0f, -1.0f);
+  CGRect rect = { { x, height - y - glw->h() }, { glw->w(), glw->h() } };
+  Fl_X::q_begin_image(rect, 0, 0, glw->w(), glw->h());
+  CGContextDrawImage(fl_gc, rect, image);
+  Fl_X::q_end_image();
+  CGContextRestoreGState(fl_gc);
+  CGImageRelease(image);
+  CGColorSpaceRelease(cSpace);
+  CGDataProviderRelease(provider);  
+#else
+  fltk3::draw_image(baseAddress + (glw->h() - 1) * mByteWidth, x, y , glw->w(), glw->h(), bytesperpixel, - mByteWidth);
+  free(baseAddress);
+#endif // __APPLE__
+}
+
+/**
+ This class will make sure that OpenGL printing is available if fltk_gl
+ was linked to the program.
+ */
+class Fl_Gl_Device_Plugin : public fltk3::DevicePlugin {
+public:
+  Fl_Gl_Device_Plugin() : fltk3::DevicePlugin(name()) { }
+  virtual const char *name() { return "opengl.device.fltk.org"; }
+  virtual int print(fltk3::Widget *w, int x, int y, int height) {
+    fltk3::GLWindow *glw = w->as_gl_window();
+    if (!glw) return 0;
+    print_gl_window(glw, x, y, height);
+    return 1; 
+  }
+};
+
+static Fl_Gl_Device_Plugin Gl_Device_Plugin;
+
+// The purpose of this variable, used in fltk3::GLWindow.cxx, is only to force this file to be loaded
+// whenever fltk3::GLWindow.cxx is loaded, that is, whenever fltk_gl is.
+FLTK3_EXPORT int fl_gl_load_plugin = 0;
+
+//
+// End of "$Id$".
+//

Copied: branches/branch-3.0/src/fltk3gl/GLOverlay.cxx (from rev 9009, branches/branch-3.0/src/fltk3gl/GL_Overlay.cxx)
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLOverlay.cxx	                        (rev 0)
+++ branches/branch-3.0/src/fltk3gl/GLOverlay.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,248 @@
+//
+// "$Id$"
+//
+// OpenGL overlay code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <config.h>
+#if HAVE_GL
+
+#include <fltk3/run.h>
+#include <fltk3/x.h>
+#include "GLChoice.H"
+#include <fltk3gl/GLWindow.h>
+#include <stdlib.h>
+
+#if !HAVE_GL_OVERLAY
+
+int fltk3::GLWindow::can_do_overlay() {return 0;}
+
+void fltk3::GLWindow::make_overlay() {overlay = this;}
+
+#else
+
+// Methods on fltk3::GLWindow that create an overlay window.  Because
+// many programs don't need the overlay, this is separated into this
+// source file so it is not linked in if not used.
+
+// Under X this is done by creating another window, of class _Fl_Gl_Overlay
+// which is a subclass of fltk3::GLWindow except it uses the overlay planes.
+// A pointer to this is stored in the "overlay" pointer of the fltk3::GLWindow.
+
+// Under win32 another GLX context is created to draw into the overlay
+// and it is stored in the "overlay" pointer.
+
+// In both cases if overlay hardware is unavailable, the overlay is
+// "faked" by drawing into the main layers.  This is indicated by
+// setting overlay == this.
+
+#ifndef WIN32
+////////////////////////////////////////////////////////////////
+// X version
+
+extern XVisualInfo *fl_find_overlay_visual();
+extern XVisualInfo *fl_overlay_visual;
+extern Colormap fl_overlay_colormap;
+extern unsigned long fl_transparent_pixel;
+extern uchar fl_overlay;
+
+class _Fl_Gl_Overlay : public fltk3::GLWindow {
+  void flush();
+  void draw();
+public:
+  void show();
+  _Fl_Gl_Overlay(int x, int y, int w, int h) :
+    fltk3::GLWindow(x,y,w,h) {
+    set_flag(INACTIVE);
+  }
+};
+
+void _Fl_Gl_Overlay::flush() {
+  make_current();
+#ifdef BOXX_BUGS
+  // The BoXX overlay is broken and you must not call swap-buffers. This
+  // code will make it work, but we lose because machines that do support
+  // double-buffered overlays will blink when they don't have to
+  glDrawBuffer(GL_FRONT);
+  draw();
+#else
+  draw();
+  swap_buffers();
+#endif
+  glFlush();
+  valid(1);
+}
+
+void _Fl_Gl_Overlay::draw() {
+  if (!valid()) glClearIndex((GLfloat)fl_transparent_pixel);
+  if (damage() != fltk3::DAMAGE_EXPOSE) glClear(GL_COLOR_BUFFER_BIT);
+  fltk3::GLWindow *w = (fltk3::GLWindow *)parent();
+  uchar save_valid = w->valid();
+  w->valid(valid());
+  fl_overlay = 1;
+  w->draw_overlay();
+  fl_overlay = 0;
+  valid(w->valid());
+  w->valid(save_valid);
+}
+
+void _Fl_Gl_Overlay::show() {
+  if (!shown()) {
+    fl_background_pixel = int(fl_transparent_pixel);
+    Fl_X::make_xid(this, fl_overlay_visual, fl_overlay_colormap);
+    fl_background_pixel = -1;
+    // find the outermost window to tell wm about the colormap:
+    fltk3::Window *w = window();
+    for (;;) {fltk3::Window *w1 = w->window(); if (!w1) break; w = w1;}
+    XSetWMColormapWindows(fl_display, fl_xid(w), &(Fl_X::i(this)->xid), 1);
+    context(fl_create_gl_context(fl_overlay_visual), 1);
+    valid(0);
+  }
+  fltk3::GLWindow::show();
+}
+
+int fltk3::GLWindow::can_do_overlay() {
+  return fl_find_overlay_visual() != 0;
+}
+
+void fltk3::GLWindow::make_overlay() {
+  if (overlay) return;
+  if (can_do_overlay()) {
+    _Fl_Gl_Overlay* o = new _Fl_Gl_Overlay(0,0,w(),h());
+    overlay = o;
+    add(*o);
+    o->show();
+  } else {
+    overlay = this; // fake the overlay
+  }
+}
+
+#else
+////////////////////////////////////////////////////////////////
+// WIN32 version:
+
+//static COLORREF *palette;
+extern int fl_overlay_depth;
+
+void fltk3::GLWindow::make_overlay() {
+  if (overlay) return;
+
+  GLContext context = fl_create_gl_context(this, g, 1);
+  if (!context) {overlay = this; return;} // fake the overlay
+
+  HDC hdc = Fl_X::i(this)->private_dc;
+  overlay = context;
+  LAYERPLANEDESCRIPTOR pfd;
+  wglDescribeLayerPlane(hdc, g->pixelformat, 1, sizeof(pfd), &pfd);
+  if (!pfd.iPixelType) {
+    ; // full-color overlay
+  } else {
+    fl_overlay_depth = pfd.cColorBits; // used by gl_color()
+    if (fl_overlay_depth > 8) fl_overlay_depth = 8;
+    COLORREF palette[256];
+    int n = (1<<fl_overlay_depth)-1;
+    // copy all colors except #0 into the overlay palette:
+    for (int i = 0; i <= n; i++) {
+      uchar r,g,b; fltk3::get_color((fltk3::Color)i,r,g,b);
+      palette[i] = RGB(r,g,b);
+    }
+    // always provide black & white in the last 2 pixels:
+    if (fl_overlay_depth < 8) {
+      palette[n-1] = RGB(0,0,0);
+      palette[n] = RGB(255,255,255);
+    }
+    // and use it:
+    wglSetLayerPaletteEntries(hdc, 1, 1, n, palette+1);
+    wglRealizeLayerPalette(hdc, 1, TRUE);
+  }
+  valid(0);
+  return;
+}
+
+int fltk3::GLWindow::can_do_overlay() {
+  if (!g) {
+    g = fltk3::GLChoice::find(mode_,alist);
+    if (!g) return 0;
+  }
+  return (g->pfd.bReserved & 15) != 0;
+}
+
+////////////////////////////////////////////////////////////////
+#endif
+
+#endif
+
+void fltk3::GLWindow::redraw_overlay() {
+  if (!shown()) return;
+  make_overlay();
+#ifdef __APPLE__
+  redraw();
+#else
+#ifndef WIN32
+  if (overlay != this)
+    ((fltk3::GLWindow*)overlay)->redraw();
+  else
+#endif
+    damage(fltk3::DAMAGE_OVERLAY);
+#endif
+}
+
+void fltk3::GLWindow::make_overlay_current() {
+  make_overlay();
+#ifdef __APPLE__
+  // this is not very useful, but unfortunately, Apple decided
+  // that front buffer drawing can no longer (OS X 10.4) be 
+  // supported on their platforms.
+  make_current();
+#else
+#if HAVE_GL_OVERLAY
+  if (overlay != this) {
+#ifdef WIN32
+    fl_set_gl_context(this, (GLContext)overlay);
+//  if (fl_overlay_depth)
+//    wglRealizeLayerPalette(Fl_X::i(this)->private_dc, 1, TRUE);
+#else
+    ((fltk3::GLWindow*)overlay)->make_current();
+#endif
+  } else
+#endif
+    glDrawBuffer(GL_FRONT);
+#endif
+}
+/** Hides the window if it is not this window, does nothing in WIN32. */
+void fltk3::GLWindow::hide_overlay() {
+#if HAVE_GL_OVERLAY
+#ifdef WIN32
+  // nothing needs to be done?  Or should it be erased?
+#else
+  if (overlay && overlay!=this) ((fltk3::GLWindow*)overlay)->hide();
+#endif
+#endif
+}
+
+#endif
+
+//
+// End of "$Id$".
+//

Copied: branches/branch-3.0/src/fltk3gl/GLWindow.cxx (from rev 9009, branches/branch-3.0/src/fltk3gl/GL_Window.cxx)
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLWindow.cxx	                        (rev 0)
+++ branches/branch-3.0/src/fltk3gl/GLWindow.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,554 @@
+//
+// "$Id$"
+//
+// OpenGL window code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include "../core/flstring.h"
+#if HAVE_GL
+
+extern int fl_gl_load_plugin;
+
+static int temp = fl_gl_load_plugin;
+
+#include <fltk3/Wrapper.h>
+#include <fltk3/run.h>
+#include <fltk3/x.h>
+#ifdef __APPLE__
+#include <fltk3gl/gl.h>
+#endif
+#include "GLChoice.H"
+#include <fltk3gl/GLWindow.h>
+#include <stdlib.h>
+#include <fltk3/utf8.h>
+
+////////////////////////////////////////////////////////////////
+
+// The symbol SWAP_TYPE defines what is in the back buffer after doing
+// a glXSwapBuffers().
+
+// The OpenGl documentation says that the contents of the backbuffer
+// are "undefined" after glXSwapBuffers().  However, if we know what
+// is in the backbuffers then we can save a good deal of time.  For
+// this reason you can define some symbols to describe what is left in
+// the back buffer.
+
+// Having not found any way to determine this from glx (or wgl) I have
+// resorted to letting the user specify it with an environment variable,
+// GL_SWAP_TYPE, it should be equal to one of these symbols:
+
+// contents of back buffer after glXSwapBuffers():
+#define UNDEFINED 1 	// anything
+#define SWAP 2		// former front buffer (same as unknown)
+#define COPY 3		// unchanged
+#define NODAMAGE 4	// unchanged even by X expose() events
+
+static char SWAP_TYPE = 0 ; // 0 = determine it from environment variable
+
+////////////////////////////////////////////////////////////////
+
+/**  Returns non-zero if the hardware supports the given or current OpenGL  mode. */
+int fltk3::GLWindow::can_do(int a, const int *b) {
+  return fltk3::GLChoice::find(a,b) != 0;
+}
+
+void fltk3::GLWindow::show() {
+#if defined(__APPLE__)
+  int need_redraw = 0;
+#endif
+  if (!shown()) {
+    if (!g) {
+      g = fltk3::GLChoice::find(mode_,alist);
+
+      if (!g && (mode_ & fltk3::DOUBLE) == fltk3::SINGLE) {
+        g = fltk3::GLChoice::find(mode_ | fltk3::DOUBLE,alist);
+	if (g) mode_ |= fltk3::FAKE_SINGLE;
+      }
+
+      if (!g) {
+        fltk3::error("Insufficient GL support");
+	return;
+      }
+    }
+#if !defined(WIN32) && !defined(__APPLE__)
+    Fl_X::make_xid(this, g->vis, g->colormap);
+    if (overlay && overlay != this) ((fltk3::GLWindow*)overlay)->show();
+#elif defined(__APPLE__)
+	if( ! parent() ) need_redraw=1;
+#endif
+  }
+  Window::show();
+
+#ifdef __APPLE__
+  set_visible();
+  if(need_redraw) redraw();//necessary only after creation of a top-level GL window
+#endif /* __APPLE__ */
+}
+
+/**
+  The invalidate() method turns off valid() and is
+  equivalent to calling value(0).
+*/
+void fltk3::GLWindow::invalidate() {
+  valid(0);
+  context_valid(0);
+#ifndef WIN32
+  if (overlay) {
+    ((fltk3::GLWindow*)overlay)->valid(0);
+    ((fltk3::GLWindow*)overlay)->context_valid(0);
+  }
+#endif
+}
+
+/**
+  See const int fltk3::GLWindow::mode() const 
+*/
+int fltk3::GLWindow::mode(int m, const int *a) {
+  if (m == mode_ && a == alist) return 0;
+#ifndef __APPLE__
+  int oldmode = mode_;
+#endif // !__APPLE__
+#if !defined(WIN32) && !defined(__APPLE__)
+  fltk3::GLChoice* oldg = g;
+#endif // !WIN32 && !__APPLE__
+  context(0);
+  mode_ = m; alist = a;
+  if (shown()) {
+    g = fltk3::GLChoice::find(m, a);
+
+#if defined(USE_X11)
+    // under X, if the visual changes we must make a new X window (yuck!):
+    if (!g || g->vis->visualid!=oldg->vis->visualid || (oldmode^m)&fltk3::DOUBLE) {
+      hide();
+      show();
+    }
+#elif defined(WIN32)
+    if (!g || (oldmode^m)&(fltk3::DOUBLE|fltk3::STEREO)) {
+      hide();
+      show();
+    }
+#elif defined(__APPLE_QUARTZ__)
+    // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+    redraw();
+#else
+#  error unsupported platform
+#endif
+  } else {
+    g = 0;
+  }
+  return 1;
+}
+
+#define NON_LOCAL_CONTEXT 0x80000000
+
+/**
+  The make_current() method selects the OpenGL context for the
+  widget.  It is called automatically prior to the draw() method
+  being called and can also be used to implement feedback and/or
+  selection within the handle() method.
+*/
+
+void fltk3::GLWindow::make_current() {
+//  puts("fltk3::GLWindow::make_current()");
+//  printf("make_current: context_=%p\n", context_);
+  if (!context_) {
+    mode_ &= ~NON_LOCAL_CONTEXT;
+    context_ = fl_create_gl_context(this, g);
+    valid(0);
+    context_valid(0);
+  }
+  fl_set_gl_context(this, context_);
+
+#ifdef __APPLE__
+  // Set the buffer rectangle here, since in resize() we won't have the
+  // correct parent window size to work with...
+  GLint xywh[4];
+
+  if (window()) {
+    xywh[0] = x();
+    xywh[1] = window()->h() - y() - h();
+  } else {
+    xywh[0] = 0;
+    xywh[1] = 0;
+  }
+
+  xywh[2] = w();
+  xywh[3] = h();
+
+  aglSetInteger(context_, AGL_BUFFER_RECT, xywh);
+  aglEnable(context_, AGL_BUFFER_RECT);
+//  printf("make_current: xywh=[%d %d %d %d]\n", xywh[0], xywh[1], xywh[2], xywh[3]);
+#endif // __APPLE__
+
+#if defined(WIN32) && USE_COLORMAP
+  if (fl_palette) {
+    fl_GetDC(fl_xid(this));
+    SelectPalette(fl_gc, fl_palette, FALSE);
+    RealizePalette(fl_gc);
+  }
+#endif // USE_COLORMAP
+  if (mode_ & fltk3::FAKE_SINGLE) {
+    glDrawBuffer(GL_FRONT);
+    glReadBuffer(GL_FRONT);
+  }
+  current_ = this;
+}
+
+/**
+  Sets the projection so 0,0 is in the lower left of the window and each
+  pixel is 1 unit wide/tall.  If you are drawing 2D images, your 
+  draw() method may want to call this if valid() is false.
+*/
+void fltk3::GLWindow::ortho() {
+// Alpha NT seems to have a broken OpenGL that does not like negative coords:
+#ifdef _M_ALPHA
+  glLoadIdentity();
+  glViewport(0, 0, w(), h());
+  glOrtho(0, w(), 0, h(), -1, 1);
+#else
+  GLint v[2];
+  glGetIntegerv(GL_MAX_VIEWPORT_DIMS, v);
+  glLoadIdentity();
+  glViewport(w()-v[0], h()-v[1], v[0], v[1]);
+  glOrtho(w()-v[0], w(), h()-v[1], h(), -1, 1);
+#endif
+}
+
+/**
+  The swap_buffers() method swaps the back and front buffers.
+  It is called automatically after the draw() method is called.
+*/
+void fltk3::GLWindow::swap_buffers() {
+#if defined(USE_X11)
+  glXSwapBuffers(fl_display, fl_xid(this));
+#elif defined(WIN32)
+#  if HAVE_GL_OVERLAY
+  // Do not swap the overlay, to match GLX:
+  BOOL ret = wglSwapLayerBuffers(Fl_X::i(this)->private_dc, WGL_SWAP_MAIN_PLANE);
+  DWORD err = GetLastError();;
+#  else
+  SwapBuffers(Fl_X::i(this)->private_dc);
+#  endif
+#elif defined(__APPLE_QUARTZ__)
+  if(overlay != NULL) {
+    //aglSwapBuffers does not work well with overlays under cocoa
+    glReadBuffer(GL_BACK);
+    glDrawBuffer(GL_FRONT);
+    glCopyPixels(0,0,w(),h(),GL_COLOR);
+  }
+  else
+    aglSwapBuffers((AGLContext)context_);
+#else
+# error unsupported platform
+#endif
+}
+
+#if HAVE_GL_OVERLAY && defined(WIN32)
+uchar fl_overlay; // changes how fltk3::color() works
+int fl_overlay_depth = 0;
+#endif
+
+
+void fltk3::GLWindow::flush() {
+  uchar save_valid = valid_f_ & 1;
+#if HAVE_GL_OVERLAY && defined(WIN32)
+  uchar save_valid_f = valid_f_;
+#endif
+
+#if defined(__APPLE_QUARTZ__)
+  // warning: the Quartz version should probably use Core GL (CGL) instead of AGL
+  //: clear previous clipping in this shared port
+#if ! __LP64__
+/*GrafPtr port = GetWindowPort( Fl_X::i(this)->window_ref() );
+  Rect rect; SetRect( &rect, 0, 0, 0x7fff, 0x7fff );
+  GrafPtr old; GetPort( &old );
+  SetPort( port );
+  ClipRect( &rect );
+  SetPort( old );*/
+#endif
+#endif
+
+#if HAVE_GL_OVERLAY && defined(WIN32)
+
+  bool fixcursor = false; // for fixing the SGI 320 bug
+
+  // Draw into hardware overlay planes if they are damaged:
+  if (overlay && overlay != this
+      && (damage()&(fltk3::DAMAGE_OVERLAY|fltk3::DAMAGE_EXPOSE) || !save_valid)) {
+    // SGI 320 messes up overlay with user-defined cursors:
+    if (Fl_X::i(this)->cursor && Fl_X::i(this)->cursor != fl_default_cursor) {
+      fixcursor = true; // make it restore cursor later
+      SetCursor(0);
+    }
+    fl_set_gl_context(this, (GLContext)overlay);
+    if (fl_overlay_depth)
+      wglRealizeLayerPalette(Fl_X::i(this)->private_dc, 1, TRUE);
+    glDisable(GL_SCISSOR_TEST);
+    glClear(GL_COLOR_BUFFER_BIT);
+    fl_overlay = 1;
+    draw_overlay();
+    fl_overlay = 0;
+    valid_f_ = save_valid_f;
+    wglSwapLayerBuffers(Fl_X::i(this)->private_dc, WGL_SWAP_OVERLAY1);
+    // if only the overlay was damaged we are done, leave main layer alone:
+    if (damage() == fltk3::DAMAGE_OVERLAY) {
+      if (fixcursor) SetCursor(Fl_X::i(this)->cursor);
+      return;
+    }
+  }
+#endif
+
+  make_current();
+
+  if (mode_ & fltk3::DOUBLE) {
+
+    glDrawBuffer(GL_BACK);
+
+    if (!SWAP_TYPE) {
+#if defined (__APPLE_QUARTZ__) || defined (USE_X11)
+      SWAP_TYPE = COPY;
+#else
+      SWAP_TYPE = UNDEFINED;
+#endif
+      const char* c = fltk3::getenv("GL_SWAP_TYPE");
+      if (c) {
+	if (!strcmp(c,"COPY")) SWAP_TYPE = COPY;
+	else if (!strcmp(c, "NODAMAGE")) SWAP_TYPE = NODAMAGE;
+	else if (!strcmp(c, "SWAP")) SWAP_TYPE = SWAP;
+	else SWAP_TYPE = UNDEFINED;
+      }
+    }
+
+    if (SWAP_TYPE == NODAMAGE) {
+
+      // don't draw if only overlay damage or expose events:
+      if ((damage()&~(fltk3::DAMAGE_OVERLAY|fltk3::DAMAGE_EXPOSE)) || !save_valid)
+	draw();
+      swap_buffers();
+
+    } else if (SWAP_TYPE == COPY) {
+
+      // don't draw if only the overlay is damaged:
+      if (damage() != fltk3::DAMAGE_OVERLAY || !save_valid) draw();
+	  swap_buffers();
+
+    } else if (SWAP_TYPE == SWAP){
+      damage(fltk3::DAMAGE_ALL);
+      draw();
+      if (overlay == this) draw_overlay();
+      swap_buffers();
+    } else if (SWAP_TYPE == UNDEFINED){ // SWAP_TYPE == UNDEFINED
+
+      // If we are faking the overlay, use CopyPixels to act like
+      // SWAP_TYPE == COPY.  Otherwise overlay redraw is way too slow.
+      if (overlay == this) {
+	// don't draw if only the overlay is damaged:
+	if (damage1_ || damage() != fltk3::DAMAGE_OVERLAY || !save_valid) draw();
+	// we use a separate context for the copy because rasterpos must be 0
+	// and depth test needs to be off:
+	static GLContext ortho_context = 0;
+	static fltk3::GLWindow* ortho_window = 0;
+	int orthoinit = !ortho_context;
+	if (orthoinit) ortho_context = fl_create_gl_context(this, g);
+	fl_set_gl_context(this, ortho_context);
+	if (orthoinit || !save_valid || ortho_window != this) {
+	  glDisable(GL_DEPTH_TEST);
+	  glReadBuffer(GL_BACK);
+	  glDrawBuffer(GL_FRONT);
+	  glLoadIdentity();
+	  glViewport(0, 0, w(), h());
+	  glOrtho(0, w(), 0, h(), -1, 1);
+	  glRasterPos2i(0,0);
+	  ortho_window = this;
+	}
+	glCopyPixels(0,0,w(),h(),GL_COLOR);
+	make_current(); // set current context back to draw overlay
+	damage1_ = 0;
+
+      } else {
+	damage1_ = damage();
+	clear_damage(0xff); draw();
+	swap_buffers();
+      }
+
+    }
+
+    if (overlay==this && SWAP_TYPE != SWAP) { // fake overlay in front buffer
+      glDrawBuffer(GL_FRONT);
+      draw_overlay();
+      glDrawBuffer(GL_BACK);
+      glFlush();
+    }
+
+  } else {	// single-buffered context is simpler:
+
+    draw();
+    if (overlay == this) draw_overlay();
+    glFlush();
+
+  }
+
+#if HAVE_GL_OVERLAY && defined(WIN32)
+  if (fixcursor) SetCursor(Fl_X::i(this)->cursor);
+#endif
+  valid(1);
+  context_valid(1);
+}
+
+void fltk3::GLWindow::resize(int X,int Y,int W,int H) {
+//  printf("fltk3::GLWindow::resize(X=%d, Y=%d, W=%d, H=%d)\n", X, Y, W, H);
+//  printf("current: x()=%d, y()=%d, w()=%d, h()=%d\n", x(), y(), w(), h());
+
+  if (W != w() || H != h()) valid(0);
+
+#ifdef __APPLE__
+  if (X != x() || Y != y() || W != w() || H != h()) aglUpdateContext(context_);
+#elif !defined(WIN32)
+  if ((W != w() || H != h()) && !resizable() && overlay && overlay != this) {
+    ((fltk3::GLWindow*)overlay)->resize(0,0,W,H);
+  }
+#endif
+
+  Window::resize(X,Y,W,H);
+}
+
+/**
+  Returns or sets a pointer to the GLContext that this window is
+  using. This is a system-dependent structure, but it is portable to copy
+  the context from one window to another. You can also set it to NULL,
+  which will force FLTK to recreate the context the next time make_current()
+  is called, this is useful for getting around bugs in OpenGL implementations.
+  
+  If <i>destroy_flag</i> is true the context will be destroyed by
+  fltk when the window is destroyed, or when the mode() is changed, 
+  or the next time context(x) is called.
+*/
+void fltk3::GLWindow::context(void* v, int destroy_flag) {
+  if (context_ && !(mode_&NON_LOCAL_CONTEXT)) fl_delete_gl_context(context_);
+  context_ = (GLContext)v;
+  if (destroy_flag) mode_ &= ~NON_LOCAL_CONTEXT;
+  else mode_ |= NON_LOCAL_CONTEXT;
+}    
+
+/**
+  Hides the window and destroys the OpenGL context.
+*/
+void fltk3::GLWindow::hide() {
+  context(0);
+#if HAVE_GL_OVERLAY && defined(WIN32)
+  if (overlay && overlay != this) {
+    fl_delete_gl_context((GLContext)overlay);
+    overlay = 0;
+  }
+#endif
+  Window::hide();
+}
+
+/**
+  The destructor removes the widget and destroys the OpenGL context
+  associated with it.
+*/
+fltk3::GLWindow::~GLWindow() {
+  hide();
+//  delete overlay; this is done by ~Fl_Group
+#ifdef __APPLE__
+  // resets the pile of string textures used to draw strings
+  extern void gl_texture_reset();
+  gl_texture_reset();
+#endif
+}
+
+void fltk3::GLWindow::init() {
+  end(); // we probably don't want any children
+  box(fltk3::NO_BOX);
+
+  mode_    = fltk3::RGB | fltk3::DEPTH | fltk3::DOUBLE;
+  alist    = 0;
+  context_ = 0;
+  g        = 0;
+  overlay  = 0;
+  valid_f_ = 0;
+  damage1_ = 0;
+
+#if 0 // This breaks resizing on Linux/X11
+  int H = h();
+  h(1); // Make sure we actually do something in resize()...
+  resize(x(), y(), w(), H);
+#endif // 0
+}
+
+/**
+  You must implement this virtual function if you want to draw into the
+  overlay.  The overlay is cleared before this is called.  You should
+  draw anything that is not clear using OpenGL.  You must use 
+  gl_color(i) to choose colors (it allocates them from the colormap
+  using system-specific calls), and remember that you are in an indexed
+  OpenGL mode and drawing anything other than flat-shaded will probably
+  not work.
+
+  Both this function and fltk3::GLWindow::draw() should check 
+  fltk3::GLWindow::valid() and set the same transformation.  If you
+  don't your code may not work on other systems.  Depending on the OS,
+  and on whether overlays are real or simulated, the OpenGL context may
+  be the same or different between the overlay and main window.
+*/
+void fltk3::GLWindow::draw_overlay() {
+  FLTK3_OBJECT_VCALLS_WRAPPER(draw_overlay(), DrawOverlay)
+}
+
+#endif
+
+  /**
+  You \e \b must subclass fltk3::GLWindow and provide an implementation for 
+  draw().  You may also provide an implementation of draw_overlay()
+  if you want to draw into the overlay planes.  You can avoid
+  reinitializing the viewport and lights and other things by checking 
+  valid() at the start of draw() and only doing the
+  initialization if it is false.
+
+  The draw() method can <I>only</I> use OpenGL calls.  Do not
+  attempt to call X, any of the functions in <fltk3/draw.h>, or glX
+  directly.  Do not call gl_start() or gl_finish().
+
+  If double-buffering is enabled in the window, the back and front
+  buffers are swapped after this function is completed.
+*/
+void fltk3::GLWindow::draw() {
+  FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
+  fltk3::fatal("fltk3::GLWindow::draw() *must* be overriden. Please refer to the documentation.");
+}
+
+
+/**
+ Handle some FLTK events as needed.
+ */
+int fltk3::GLWindow::handle(int event) 
+{
+  FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
+  return Window::handle(event);
+}
+
+//
+// End of "$Id$".
+//

Deleted: branches/branch-3.0/src/fltk3gl/GL_Choice.cxx

Deleted: branches/branch-3.0/src/fltk3gl/GL_Choice.h

Deleted: branches/branch-3.0/src/fltk3gl/GL_DevicePlugin.cxx

Deleted: branches/branch-3.0/src/fltk3gl/GL_Overlay.cxx

Deleted: branches/branch-3.0/src/fltk3gl/GL_Window.cxx

Modified: branches/branch-3.0/src/fltk3gl/freeglut_geometry.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/freeglut_geometry.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/fltk3gl/freeglut_geometry.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -25,7 +25,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <fltk3/glut.h>
+#include <fltk3gl/glut.h>
 #include <fltk3/math.h>
 #include <stdlib.h>
 

Modified: branches/branch-3.0/src/fltk3gl/freeglut_stroke_mono_roman.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/freeglut_stroke_mono_roman.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/fltk3gl/freeglut_stroke_mono_roman.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -28,7 +28,7 @@
 
 /* This file has been automatically generated by the genstroke utility. */
 
-#include <fltk3/glut.h>
+#include <fltk3gl/glut.h>
 
 /* char: 0x20 */
 

Modified: branches/branch-3.0/src/fltk3gl/freeglut_stroke_roman.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/freeglut_stroke_roman.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/fltk3gl/freeglut_stroke_roman.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -28,7 +28,7 @@
 
 /* This file has been automatically generated by the genstroke utility. */
 
-#include <fltk3/glut.h>
+#include <fltk3gl/glut.h>
 
 /* char: 0x20 */
 

Modified: branches/branch-3.0/src/fltk3gl/freeglut_teapot.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/freeglut_teapot.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/fltk3gl/freeglut_teapot.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -72,7 +72,7 @@
  * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
  */
 
-#include <fltk3/glut.h>
+#include <fltk3gl/glut.h>
 #include "freeglut_teapot_data.h"
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */

Copied: branches/branch-3.0/src/fltk3gl/freeglut_teapot_data.h (from rev 9002, branches/branch-3.0/src/core/freeglut_teapot_data.h)
===================================================================
--- branches/branch-3.0/src/fltk3gl/freeglut_teapot_data.h	                        (rev 0)
+++ branches/branch-3.0/src/fltk3gl/freeglut_teapot_data.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -0,0 +1,145 @@
+/*
+ * freeglut_teapot_data.h
+ *
+ * The freeglut library teapot data include file.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef  FREEGLUT_TEAPOT_DATA_H
+#define  FREEGLUT_TEAPOT_DATA_H
+
+/*
+ * Original teapot code copyright follows:
+ */
+
+/*
+ * (c) Copyright 1993, Silicon Graphics, Inc.
+ *
+ * ALL RIGHTS RESERVED
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that
+ * both the copyright notice and this permission notice appear in
+ * supporting documentation, and that the name of Silicon
+ * Graphics, Inc. not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.
+ *
+ * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
+ * "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
+ * OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
+ * EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
+ * ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
+ * INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
+ * SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
+ * NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
+ * OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * US Government Users Restricted Rights
+ *
+ * Use, duplication, or disclosure by the Government is subject to
+ * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
+ * (c)(1)(ii) of the Rights in Technical Data and Computer
+ * Software clause at DFARS 252.227-7013 and/or in similar or
+ * successor clauses in the FAR or the DOD or NASA FAR
+ * Supplement.  Unpublished-- rights reserved under the copyright
+ * laws of the United States.  Contractor/manufacturer is Silicon
+ * Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
+ * 94039-7311.
+ *
+ * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
+ */
+
+/*
+ * Rim, body, lid, and bottom data must be reflected in x and y;
+ * handle and spout data across the y axis only.
+ */
+static int patchdata[][16] =
+{
+    { 102, 103, 104, 105,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15 }, /* rim    */
+    {  12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27 }, /* body   */
+    {  24,  25,  26,  27,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40 },
+    {  96,  96,  96,  96,  97,  98,  99, 100, 101, 101, 101, 101,   0,   1,   2,   3 }, /* lid    */
+    {   0,   1,   2,   3, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117 },
+    { 118, 118, 118, 118, 124, 122, 119, 121, 123, 126, 125, 120,  40,  39,  38,  37 }, /* bottom */
+    {  41,  42,  43,  44,  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56 }, /* handle */
+    {  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,  64,  28,  65,  66,  67 },
+    {  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  83 }, /* spout  */
+    {  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95 }
+};
+
+static double cpdata[][3] =
+{
+    {0.2, 0, 2.7}, {0.2, -0.112, 2.7}, {0.112, -0.2, 2.7}, {0,
+    -0.2, 2.7}, {1.3375, 0, 2.53125}, {1.3375, -0.749, 2.53125},
+    {0.749, -1.3375, 2.53125}, {0, -1.3375, 2.53125}, {1.4375,
+    0, 2.53125}, {1.4375, -0.805, 2.53125}, {0.805, -1.4375,
+    2.53125}, {0, -1.4375, 2.53125}, {1.5, 0, 2.4}, {1.5, -0.84,
+    2.4}, {0.84, -1.5, 2.4}, {0, -1.5, 2.4}, {1.75, 0, 1.875},
+    {1.75, -0.98, 1.875}, {0.98, -1.75, 1.875}, {0, -1.75,
+    1.875}, {2, 0, 1.35}, {2, -1.12, 1.35}, {1.12, -2, 1.35},
+    {0, -2, 1.35}, {2, 0, 0.9}, {2, -1.12, 0.9}, {1.12, -2,
+    0.9}, {0, -2, 0.9}, {-2, 0, 0.9}, {2, 0, 0.45}, {2, -1.12,
+    0.45}, {1.12, -2, 0.45}, {0, -2, 0.45}, {1.5, 0, 0.225},
+    {1.5, -0.84, 0.225}, {0.84, -1.5, 0.225}, {0, -1.5, 0.225},
+    {1.5, 0, 0.15}, {1.5, -0.84, 0.15}, {0.84, -1.5, 0.15}, {0,
+    -1.5, 0.15}, {-1.6, 0, 2.025}, {-1.6, -0.3, 2.025}, {-1.5,
+    -0.3, 2.25}, {-1.5, 0, 2.25}, {-2.3, 0, 2.025}, {-2.3, -0.3,
+    2.025}, {-2.5, -0.3, 2.25}, {-2.5, 0, 2.25}, {-2.7, 0,
+    2.025}, {-2.7, -0.3, 2.025}, {-3, -0.3, 2.25}, {-3, 0,
+    2.25}, {-2.7, 0, 1.8}, {-2.7, -0.3, 1.8}, {-3, -0.3, 1.8},
+    {-3, 0, 1.8}, {-2.7, 0, 1.575}, {-2.7, -0.3, 1.575}, {-3,
+    -0.3, 1.35}, {-3, 0, 1.35}, {-2.5, 0, 1.125}, {-2.5, -0.3,
+    1.125}, {-2.65, -0.3, 0.9375}, {-2.65, 0, 0.9375}, {-2,
+    -0.3, 0.9}, {-1.9, -0.3, 0.6}, {-1.9, 0, 0.6}, {1.7, 0,
+    1.425}, {1.7, -0.66, 1.425}, {1.7, -0.66, 0.6}, {1.7, 0,
+    0.6}, {2.6, 0, 1.425}, {2.6, -0.66, 1.425}, {3.1, -0.66,
+    0.825}, {3.1, 0, 0.825}, {2.3, 0, 2.1}, {2.3, -0.25, 2.1},
+    {2.4, -0.25, 2.025}, {2.4, 0, 2.025}, {2.7, 0, 2.4}, {2.7,
+    -0.25, 2.4}, {3.3, -0.25, 2.4}, {3.3, 0, 2.4}, {2.8, 0,
+    2.475}, {2.8, -0.25, 2.475}, {3.525, -0.25, 2.49375},
+    {3.525, 0, 2.49375}, {2.9, 0, 2.475}, {2.9, -0.15, 2.475},
+    {3.45, -0.15, 2.5125}, {3.45, 0, 2.5125}, {2.8, 0, 2.4},
+    {2.8, -0.15, 2.4}, {3.2, -0.15, 2.4}, {3.2, 0, 2.4}, {0, 0,
+    3.15}, {0.8, 0, 3.15}, {0.8, -0.45, 3.15}, {0.45, -0.8,
+    3.15}, {0, -0.8, 3.15}, {0, 0, 2.85}, {1.4, 0, 2.4}, {1.4,
+    -0.784, 2.4}, {0.784, -1.4, 2.4}, {0, -1.4, 2.4}, {0.4, 0,
+    2.55}, {0.4, -0.224, 2.55}, {0.224, -0.4, 2.55}, {0, -0.4,
+    2.55}, {1.3, 0, 2.55}, {1.3, -0.728, 2.55}, {0.728, -1.3,
+    2.55}, {0, -1.3, 2.55}, {1.3, 0, 2.4}, {1.3, -0.728, 2.4},
+    {0.728, -1.3, 2.4}, {0, -1.3, 2.4}, {0, 0, 0}, {1.425,
+    -0.798, 0}, {1.5, 0, 0.075}, {1.425, 0, 0}, {0.798, -1.425,
+    0}, {0, -1.5, 0.075}, {0, -1.425, 0}, {1.5, -0.84, 0.075},
+    {0.84, -1.5, 0.075}
+};
+
+static double tex[2][2][2] =
+{
+    { {0.0, 0.0}, {1.0, 0.0} },
+    { {0.0, 1.0}, {1.0, 1.0} }
+};
+
+
+#endif  /* FREEGLUT_TEAPOT_DATA_H */
+

Modified: branches/branch-3.0/src/makedepend
===================================================================
--- branches/branch-3.0/src/makedepend	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/src/makedepend	2011-08-25 11:40:26 UTC (rev 9010)
@@ -1,20 +1,20 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-core/Fl.o: ../include/config.h ../include/fltk3/Wrapper.h
-core/Fl.o: ../include/fltk3/Widget.h ../include/fltk3/enumerations.h
-core/Fl.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/Fl.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
-core/Fl.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/Fl.o: ../include/fltk3/Xutf8.h ../include/fltk3/Window.h
-core/Fl.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
-core/Fl.o: ../include/fltk3/Tooltip.h ../include/fltk3/x.h
-core/Fl.o: ../include/fltk3/Window.h core/flstring.h
-core/Fl.o: ../include/fltk3/Export.h ../include/fltk3/draw.h
-core/Fl.o: ../include/fltk3/enumerations.h ../include/fltk3/Device.h
-core/Fl.o: ../include/fltk3/Object.h ../include/fltk3/Plugin.h
-core/Fl.o: ../include/fltk3/Preferences.h ../include/fltk3/Image.h
-core/Fl.o: ../include/fltk3/Bitmap.h ../include/fltk3/Image.h
-core/Fl.o: ../include/fltk3/Pixmap.h ../include/fltk3/RGBImage.h
+fltk3/run.o: ../include/config.h ../include/fltk3/Wrapper.h
+fltk3/run.o: ../include/fltk3/Widget.h ../include/fltk3/enumerations.h
+fltk3/run.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+fltk3/run.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
+fltk3/run.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3/run.o: ../include/fltk3/Xutf8.h ../include/fltk3/Window.h
+fltk3/run.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
+fltk3/run.o: ../include/fltk3/Tooltip.h ../include/fltk3/x.h
+fltk3/run.o: ../include/fltk3/Window.h core/flstring.h
+fltk3/run.o: ../include/fltk3/Export.h ../include/fltk3/draw.h
+fltk3/run.o: ../include/fltk3/enumerations.h ../include/fltk3/Device.h
+fltk3/run.o: ../include/fltk3/Object.h ../include/fltk3/Plugin.h
+fltk3/run.o: ../include/fltk3/Preferences.h ../include/fltk3/Image.h
+fltk3/run.o: ../include/fltk3/Bitmap.h ../include/fltk3/Image.h
+fltk3/run.o: ../include/fltk3/Pixmap.h ../include/fltk3/RGBImage.h
 core/Fl_Adjuster.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 core/Fl_Adjuster.o: ../include/fltk3/Export.h ../include/fltk3/types.h
 core/Fl_Adjuster.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
@@ -476,15 +476,16 @@
 core/Fl_Input_.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
 core/Fl_Input_.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
 core/Fl_Input_.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
+core/Fl_Input_.o: ../include/fltk3/MenuItem.h ../include/fltk3/Image.h
 core/Fl_Input_.o: ../include/fltk3/draw.h ../include/fltk3/x.h
 core/Fl_Input_.o: ../include/fltk3/Window.h ../include/fltk3/enumerations.h
 core/Fl_Input_.o: ../include/fltk3/Device.h ../include/fltk3/Object.h
 core/Fl_Input_.o: ../include/fltk3/Plugin.h ../include/fltk3/Preferences.h
 core/Fl_Input_.o: ../include/fltk3/Image.h ../include/fltk3/Bitmap.h
-core/Fl_Input_.o: ../include/fltk3/Image.h ../include/fltk3/Pixmap.h
-core/Fl_Input_.o: ../include/fltk3/RGBImage.h ../include/fltk3/ask.h
-core/Fl_Input_.o: ../include/fltk3/utf8.h core/flstring.h
-core/Fl_Input_.o: ../include/fltk3/Export.h ../include/config.h
+core/Fl_Input_.o: ../include/fltk3/Pixmap.h ../include/fltk3/RGBImage.h
+core/Fl_Input_.o: ../include/fltk3/ask.h ../include/fltk3/utf8.h
+core/Fl_Input_.o: core/flstring.h ../include/fltk3/Export.h
+core/Fl_Input_.o: ../include/config.h
 core/Fl_Light_Button.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 core/Fl_Light_Button.o: ../include/fltk3/Export.h ../include/fltk3/types.h
 core/Fl_Light_Button.o: ../include/fltk3/Xutf8.h
@@ -977,6 +978,7 @@
 core/Fl_Text_Display.o: ../include/fltk3/Scrollbar.h
 core/Fl_Text_Display.o: ../include/fltk3/Slider.h ../include/fltk3/Valuator.h
 core/Fl_Text_Display.o: ../include/fltk3/TextBuffer.h
+core/Fl_Text_Display.o: ../include/fltk3/MenuItem.h
 core/Fl_Text_Display.o: ../include/fltk3/Printer.h
 core/Fl_Text_Display.o: ../include/fltk3/PagedDevice.h
 core/Fl_Text_Display.o: ../include/fltk3/draw.h ../include/fltk3/PostScript.h
@@ -1911,128 +1913,181 @@
 core/screen_xywh.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
 core/screen_xywh.o: ../include/fltk3/x.h ../include/fltk3/Window.h
 core/screen_xywh.o: ../include/config.h
-core/Fl_Gl_Choice.o: ../include/config.h ../include/fltk3/run.h
-core/Fl_Gl_Choice.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
-core/Fl_Gl_Choice.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
-core/Fl_Gl_Choice.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
-core/Fl_Gl_Choice.o: ../include/fltk3/Window.h core/Fl_Gl_Choice.H
-core/Fl_Gl_Choice.o: ../include/fltk3/glDraw.h ../include/fltk3/gl.h
-core/Fl_Gl_Choice.o: core/flstring.h ../include/fltk3/Export.h
-core/Fl_Gl_Choice.o: ../include/fltk3/utf8.h
-core/Fl_Gl_Device_Plugin.o: ../include/config.h ../include/fltk3/Printer.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/x.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/enumerations.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Export.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/types.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Window.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Xutf8.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/PagedDevice.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Device.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Object.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Plugin.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Preferences.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Image.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Object.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Bitmap.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Image.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Pixmap.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/RGBImage.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Window.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Group.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Widget.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Wrapper.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Widget.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/Rectangle.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/draw.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/enumerations.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/PostScript.h
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/GlWindow.h core/Fl_Gl_Choice.H
-core/Fl_Gl_Device_Plugin.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/Fl_Gl_Overlay.o: ../include/config.h ../include/fltk3/run.h
-core/Fl_Gl_Overlay.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
-core/Fl_Gl_Overlay.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
-core/Fl_Gl_Overlay.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
-core/Fl_Gl_Overlay.o: ../include/fltk3/Window.h core/Fl_Gl_Choice.H
-core/Fl_Gl_Overlay.o: ../include/fltk3/GlWindow.h
-core/Fl_Gl_Window.o: core/flstring.h ../include/fltk3/Export.h
-core/Fl_Gl_Window.o: ../include/config.h ../include/fltk3/Wrapper.h
-core/Fl_Gl_Window.o: ../include/fltk3/Widget.h
-core/Fl_Gl_Window.o: ../include/fltk3/enumerations.h
-core/Fl_Gl_Window.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/Fl_Gl_Window.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
-core/Fl_Gl_Window.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/Fl_Gl_Window.o: ../include/fltk3/Xutf8.h ../include/fltk3/x.h
-core/Fl_Gl_Window.o: ../include/fltk3/Window.h core/Fl_Gl_Choice.H
-core/Fl_Gl_Window.o: ../include/fltk3/GlWindow.h ../include/fltk3/utf8.h
-core/freeglut_geometry.o: ../include/fltk3/glut.h ../include/fltk3/gl.h
-core/freeglut_geometry.o: ../include/fltk3/enumerations.h
-core/freeglut_geometry.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/freeglut_geometry.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/freeglut_geometry.o: ../include/fltk3/Xutf8.h
-core/freeglut_geometry.o: ../include/fltk3/GlWindow.h
-core/freeglut_geometry.o: ../include/fltk3/Window.h ../include/fltk3/math.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/glut.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/gl.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/enumerations.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/Export.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/types.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/run.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/utf8.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/Xutf8.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/GlWindow.h
-core/freeglut_stroke_mono_roman.o: ../include/fltk3/Window.h
-core/freeglut_stroke_roman.o: ../include/fltk3/glut.h ../include/fltk3/gl.h
-core/freeglut_stroke_roman.o: ../include/fltk3/enumerations.h
-core/freeglut_stroke_roman.o: ../include/fltk3/Export.h
-core/freeglut_stroke_roman.o: ../include/fltk3/types.h ../include/fltk3/run.h
-core/freeglut_stroke_roman.o: ../include/fltk3/utf8.h
-core/freeglut_stroke_roman.o: ../include/fltk3/Xutf8.h
-core/freeglut_stroke_roman.o: ../include/fltk3/GlWindow.h
-core/freeglut_stroke_roman.o: ../include/fltk3/Window.h
-core/freeglut_teapot.o: ../include/fltk3/glut.h ../include/fltk3/gl.h
-core/freeglut_teapot.o: ../include/fltk3/enumerations.h
-core/freeglut_teapot.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/freeglut_teapot.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/freeglut_teapot.o: ../include/fltk3/Xutf8.h ../include/fltk3/GlWindow.h
-core/freeglut_teapot.o: ../include/fltk3/Window.h core/freeglut_teapot_data.h
-core/gl_draw.o: core/flstring.h ../include/fltk3/Export.h ../include/config.h
-core/gl_draw.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/gl_draw.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/gl_draw.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
-core/gl_draw.o: ../include/fltk3/gl.h ../include/fltk3/x.h
-core/gl_draw.o: ../include/fltk3/Window.h ../include/fltk3/draw.h
-core/gl_draw.o: ../include/fltk3/enumerations.h ../include/fltk3/Window.h
-core/gl_draw.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
-core/gl_draw.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
-core/gl_draw.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
-core/gl_draw.o: ../include/fltk3/Device.h ../include/fltk3/Object.h
-core/gl_draw.o: ../include/fltk3/Plugin.h ../include/fltk3/Preferences.h
-core/gl_draw.o: ../include/fltk3/Image.h ../include/fltk3/Bitmap.h
-core/gl_draw.o: ../include/fltk3/Image.h ../include/fltk3/Pixmap.h
-core/gl_draw.o: ../include/fltk3/RGBImage.h core/Fl_Gl_Choice.H
-core/gl_draw.o: core/Fl_Font.H ../include/fltk3/Xutf8.h
-core/gl_draw.o: ../include/fltk3/utf8.h
-core/glut_compatability.o: core/flstring.h ../include/fltk3/Export.h
-core/glut_compatability.o: ../include/config.h ../include/fltk3/glut.h
-core/glut_compatability.o: ../include/fltk3/gl.h
-core/glut_compatability.o: ../include/fltk3/enumerations.h
-core/glut_compatability.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/glut_compatability.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/glut_compatability.o: ../include/fltk3/Xutf8.h
-core/glut_compatability.o: ../include/fltk3/GlWindow.h
-core/glut_compatability.o: ../include/fltk3/Window.h
-core/glut_compatability.o: ../include/fltk3/Wrapper.h
-core/glut_compatability.o: ../include/fltk3/Widget.h
-core/glut_compatability.o: ../include/fltk3/Rectangle.h
-core/glut_compatability.o: ../include/fltk3/Object.h
-core/glut_compatability.o: ../include/fltk3/MenuItem.h
-core/glut_compatability.o: ../include/fltk3/Widget.h ../include/fltk3/Image.h
-core/glut_font.o: ../include/config.h ../include/fltk3/glut.h
-core/glut_font.o: ../include/fltk3/gl.h ../include/fltk3/enumerations.h
-core/glut_font.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-core/glut_font.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
-core/glut_font.o: ../include/fltk3/Xutf8.h ../include/fltk3/GlWindow.h
-core/glut_font.o: ../include/fltk3/Window.h
+fltk3gl/GLChoice.o: ../include/config.h ../include/fltk3/run.h
+fltk3gl/GLChoice.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
+fltk3gl/GLChoice.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
+fltk3gl/GLChoice.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
+fltk3gl/GLChoice.o: ../include/fltk3/Window.h fltk3gl/GLChoice.H
+fltk3gl/GLChoice.o: ../include/fltk3gl/glDraw.h ../include/fltk3gl/gl.h
+fltk3gl/GLChoice.o: ../include/fltk3/enumerations.h core/flstring.h
+fltk3gl/GLChoice.o: ../include/fltk3/Export.h ../include/fltk3/utf8.h
+fltk3gl/GLDevicePlugin.o: ../include/config.h ../include/fltk3/Printer.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/x.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/enumerations.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Window.h ../include/fltk3/Xutf8.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/PagedDevice.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Device.h ../include/fltk3/Object.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Plugin.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Preferences.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Image.h ../include/fltk3/Object.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Bitmap.h ../include/fltk3/Image.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Pixmap.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/RGBImage.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Widget.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Wrapper.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Widget.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/Rectangle.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/draw.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/enumerations.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/PostScript.h
+fltk3gl/GLDevicePlugin.o: ../include/fltk3gl/GLWindow.h fltk3gl/GLChoice.H
+fltk3gl/GLDevicePlugin.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3gl/GLOverlay.o: ../include/config.h ../include/fltk3/run.h
+fltk3gl/GLOverlay.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
+fltk3gl/GLOverlay.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
+fltk3gl/GLOverlay.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
+fltk3gl/GLOverlay.o: ../include/fltk3/Window.h fltk3gl/GLChoice.H
+fltk3gl/GLOverlay.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
+fltk3gl/GLOverlay.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
+fltk3gl/GLOverlay.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
+fltk3gl/GLOverlay.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
+fltk3gl/GLWindow.o: core/flstring.h ../include/fltk3/Export.h
+fltk3gl/GLWindow.o: ../include/config.h ../include/fltk3/Wrapper.h
+fltk3gl/GLWindow.o: ../include/fltk3/Widget.h ../include/fltk3/enumerations.h
+fltk3gl/GLWindow.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+fltk3gl/GLWindow.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
+fltk3gl/GLWindow.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3gl/GLWindow.o: ../include/fltk3/Xutf8.h ../include/fltk3/x.h
+fltk3gl/GLWindow.o: ../include/fltk3/Window.h fltk3gl/GLChoice.H
+fltk3gl/GLWindow.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
+fltk3gl/GLWindow.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
+fltk3gl/GLWindow.o: ../include/fltk3/utf8.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3gl/glut.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3gl/gl.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Export.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/types.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Xutf8.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3gl/GLWindow.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Window.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Group.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Wrapper.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Rectangle.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/Object.h
+fltk3gl/freeglut_geometry.o: ../include/fltk3/math.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3gl/glut.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3gl/gl.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/run.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/utf8.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Export.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/types.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Xutf8.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3gl/GLWindow.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Window.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Group.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Wrapper.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Rectangle.h
+fltk3gl/freeglut_stroke_mono_roman.o: ../include/fltk3/Object.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3gl/glut.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3gl/gl.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/run.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/utf8.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Export.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/types.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Xutf8.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3gl/GLWindow.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Window.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Group.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Wrapper.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Rectangle.h
+fltk3gl/freeglut_stroke_roman.o: ../include/fltk3/Object.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3gl/glut.h ../include/fltk3gl/gl.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Xutf8.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/enumerations.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3gl/GLWindow.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Wrapper.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Widget.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Rectangle.h
+fltk3gl/freeglut_teapot.o: ../include/fltk3/Object.h
+fltk3gl/freeglut_teapot.o: fltk3gl/freeglut_teapot_data.h
+fltk3gl/gl_draw.o: core/flstring.h ../include/fltk3/Export.h
+fltk3gl/gl_draw.o: ../include/config.h ../include/fltk3/run.h
+fltk3gl/gl_draw.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
+fltk3gl/gl_draw.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
+fltk3gl/gl_draw.o: ../include/fltk3/enumerations.h ../include/fltk3gl/gl.h
+fltk3gl/gl_draw.o: ../include/fltk3/enumerations.h ../include/fltk3/x.h
+fltk3gl/gl_draw.o: ../include/fltk3/Window.h ../include/fltk3/draw.h
+fltk3gl/gl_draw.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
+fltk3gl/gl_draw.o: ../include/fltk3/Widget.h ../include/fltk3/Wrapper.h
+fltk3gl/gl_draw.o: ../include/fltk3/Widget.h ../include/fltk3/Rectangle.h
+fltk3gl/gl_draw.o: ../include/fltk3/Object.h ../include/fltk3/Device.h
+fltk3gl/gl_draw.o: ../include/fltk3/Object.h ../include/fltk3/Plugin.h
+fltk3gl/gl_draw.o: ../include/fltk3/Preferences.h ../include/fltk3/Image.h
+fltk3gl/gl_draw.o: ../include/fltk3/Bitmap.h ../include/fltk3/Image.h
+fltk3gl/gl_draw.o: ../include/fltk3/Pixmap.h ../include/fltk3/RGBImage.h
+fltk3gl/gl_draw.o: fltk3gl/GLChoice.H core/Fl_Font.H ../include/fltk3/Xutf8.h
+fltk3gl/gl_draw.o: ../include/fltk3/utf8.h
+fltk3gl/gl_start.o: ../include/config.h ../include/fltk3/run.h
+fltk3gl/gl_start.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
+fltk3gl/gl_start.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
+fltk3gl/gl_start.o: ../include/fltk3/enumerations.h ../include/fltk3/Window.h
+fltk3gl/gl_start.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
+fltk3gl/gl_start.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
+fltk3gl/gl_start.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
+fltk3gl/gl_start.o: ../include/fltk3/x.h ../include/fltk3/Window.h
+fltk3gl/gl_start.o: ../include/fltk3/draw.h ../include/fltk3/enumerations.h
+fltk3gl/gl_start.o: ../include/fltk3/Device.h ../include/fltk3/Object.h
+fltk3gl/gl_start.o: ../include/fltk3/Plugin.h ../include/fltk3/Preferences.h
+fltk3gl/gl_start.o: ../include/fltk3/Image.h ../include/fltk3/Bitmap.h
+fltk3gl/gl_start.o: ../include/fltk3/Image.h ../include/fltk3/Pixmap.h
+fltk3gl/gl_start.o: ../include/fltk3/RGBImage.h fltk3gl/GLChoice.H
+fltk3gl/glut_compatability.o: core/flstring.h ../include/fltk3/Export.h
+fltk3gl/glut_compatability.o: ../include/config.h ../include/fltk3gl/glut.h
+fltk3gl/glut_compatability.o: ../include/fltk3gl/gl.h
+fltk3gl/glut_compatability.o: ../include/fltk3/enumerations.h
+fltk3gl/glut_compatability.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Export.h
+fltk3gl/glut_compatability.o: ../include/fltk3/types.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Xutf8.h
+fltk3gl/glut_compatability.o: ../include/fltk3/enumerations.h
+fltk3gl/glut_compatability.o: ../include/fltk3gl/GLWindow.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Window.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Group.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Widget.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Wrapper.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Widget.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Rectangle.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Object.h
+fltk3gl/glut_compatability.o: ../include/fltk3/MenuItem.h
+fltk3gl/glut_compatability.o: ../include/fltk3/Image.h
+fltk3gl/glut_font.o: ../include/config.h ../include/fltk3gl/glut.h
+fltk3gl/glut_font.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+fltk3gl/glut_font.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fltk3gl/glut_font.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+fltk3gl/glut_font.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
+fltk3gl/glut_font.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
+fltk3gl/glut_font.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
+fltk3gl/glut_font.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
+fltk3gl/glut_font.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
 core/Fl_BMP_Image.o: ../include/fltk3/BMPImage.h ../include/fltk3/Image.h
 core/Fl_BMP_Image.o: ../include/fltk3/utf8.h ../include/config.h
 core/Fl_File_Icon2.o: ../include/fltk3/utf8.h core/flstring.h

Modified: branches/branch-3.0/test/CubeView.cxx
===================================================================
--- branches/branch-3.0/test/CubeView.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/CubeView.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -31,7 +31,7 @@
 
 #if HAVE_GL
 CubeView::CubeView(int x,int y,int w,int h,const char *l)
-            : fltk3::GlWindow(x,y,w,h,l)
+            : fltk3::GLWindow(x,y,w,h,l)
 #else
 CubeView::CubeView(int x,int y,int w,int h,const char *l)
             : fltk3::Box(x,y,w,h,l)

Modified: branches/branch-3.0/test/CubeView.h
===================================================================
--- branches/branch-3.0/test/CubeView.h	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/CubeView.h	2011-08-25 11:40:26 UTC (rev 9010)
@@ -30,8 +30,8 @@
 #include <config.h>
 #include <fltk3/run.h>
 #if HAVE_GL
-#  include <fltk3/GlWindow.h>
-#  include <fltk3/gl.h>
+#  include <fltk3gl/GlWindow.h>
+#  include <fltk3gl/gl.h>
 #else
 #  include <fltk3/Box.h>
 #endif /* HAVE_GL */
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 
 #if HAVE_GL
-class CubeView : public fltk3::GlWindow {
+class CubeView : public fltk3::GLWindow {
 #else
 class CubeView : public fltk3::Box {
 #endif /* HAVE_GL */

Modified: branches/branch-3.0/test/cube.cxx
===================================================================
--- branches/branch-3.0/test/cube.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/cube.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -49,10 +49,10 @@
   }
 };
 #else
-#include <fltk3/GlWindow.h>
-#include <fltk3/gl.h>
+#include <fltk3gl/GLWindow.h>
+#include <fltk3gl/gl.h>
 
-class cube_box : public fltk3::GlWindow {
+class cube_box : public fltk3::GLWindow {
   void draw();
   int handle(int);
 public:
@@ -61,7 +61,7 @@
   double size;
   double speed;
   cube_box(int x,int y,int w,int h,const char *l=0)
-    : fltk3::GlWindow(x,y,w,h,l) {lasttime = 0.0;}
+    : fltk3::GLWindow(x,y,w,h,l) {lasttime = 0.0;}
 };
 
 /* The cube definition */
@@ -129,7 +129,7 @@
   case fltk3::ENTER: cursor(fltk3::CURSOR_CROSS); break;
   case fltk3::LEAVE: cursor(fltk3::CURSOR_DEFAULT); break;
   }
-  return GlWindow::handle(e);
+  return GLWindow::handle(e);
 }
 
 #endif

Modified: branches/branch-3.0/test/demo.cxx
===================================================================
--- branches/branch-3.0/test/demo.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/demo.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -380,11 +380,11 @@
     while (line[i] == ' ' || line[i] == '\t') i++;
     if (line[i] == '\n') continue;
     if (line[i] == '#') continue;
-    while (line[i] != ':' && line[i] != '\n') mname[j++] = line[i++];
+    while (line[i] != ';' && line[i] != '\n') mname[j++] = line[i++];
     mname[j] = '\0';
-    if (line[i] == ':') i++;
+    if (line[i] == ';') i++;
     j = 0; 
-    while (line[i] != ':' && line[i] != '\n')
+    while (line[i] != ';' && line[i] != '\n')
     {
       if (line[i] == '\\') {
         i++;
@@ -395,9 +395,9 @@
         iname[j++] = line[i++];
     }
     iname[j] = '\0';
-    if (line[i] == ':') i++;
+    if (line[i] == ';') i++;
     j = 0;
-    while (line[i] != ':' && line[i] != '\n') cname[j++] = line[i++];
+    while (line[i] != ';' && line[i] != '\n') cname[j++] = line[i++];
     cname[j] = '\0';
     addto_menu(mname,iname,cname);
   }

Modified: branches/branch-3.0/test/demo.menu
===================================================================
--- branches/branch-3.0/test/demo.menu	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/demo.menu	2011-08-25 11:40:26 UTC (rev 9010)
@@ -1,96 +1,96 @@
 # Menu description file for the generic demo program
 #
-# Each line consists of three fields, separated by :
+# Each line consists of three fields, separated by ;
 #
-# - menu name	: To which the item belongs (starts with @)
-# - item name	: Placed on button. (use \n for newline)
-# - command name: To be executed. Use a menu name to define a submenu.
+# - menu name	; To which the item belongs (starts with @)
+# - item name	; Placed on button. (use \n for newline)
+# - command name; To be executed. Use a menu name to define a submenu.
 #
 # @main indicates the main menu.
 #
 
-@main:Widget\nTests...:@x
-	@x:Fl_Browser:browser
-	@x:Fl_Input:input
-	@x:Fl_Output:output
-	@x:Fl_Button:radio
-	@x:Fl_Tabs:tabs
-	@x:Fl_Tile:tile
-	@x:Fl_Scroll:scroll
-	@x:Fl_Pack:pack
-	@x:more...:@xm
-		@xm:Fl_Menu:menubar
-		@xm:Fl_Table:table
-		@xm:Fl_Tree:tree
+@main;Widget\nTests...;@x
+	@x;fltk3::\nBrowser;browser
+	@x;fltk3::Input;input
+	@x;fltk3::Output;output
+	@x;fltk3::Button;radio
+	@x;fltk3::Tabs;tabs
+	@x;fltk3::Tile;tile
+	@x;fltk3::\nScrollGroup;scroll
+	@x;fltk3::\nPackedGroup;pack
+	@x;more...;@xm
+		@xm;fltk3::Menu;menubar
+		@xm;fltk3::Table;table
+		@xm;fltk3::Tree;tree
 
-@main:Window\nTests...:@w
-	@w:overlay:overlay
-	@w:subwindow:subwindow
-	@w:double\nbuffer:doublebuffer
-	@w:GL window:cube
-	@w:GL overlay:gl_overlay
-	@w:iconize:iconize
-	@w:fullscreen:fullscreen
-	@w:resizable:resizebox
-	@w:resize:resize
+@main;Window\nTests...;@w
+	@w;overlay;overlay
+	@w;subwindow;subwindow
+	@w;double\nbuffer;doublebuffer
+	@w;GL window;cube
+	@w;GL overlay;gl_overlay
+	@w;iconize;iconize
+	@w;fullscreen;fullscreen
+	@w;resizable;resizebox
+	@w;resize;resize
 
-@main:Drawing\nTests...:@d
-	@d:Images...:@di
-		@di:Fl_Bitmap:bitmap
-		@di:Fl_Pixmap:pixmap
-		@di:Fl_RGB\n_Image:image
-		@di:Fl_Shared\n_Image:pixmap_browser
-		@di:Fl_Tiled\n_Image:tiled_image
-	@d:cursor:cursor
-	@d:labels:label
-	@d:rotated text:rotated_text
-	@d:fl_arc:arc
-	@d:fl_curve:curve
-	@d:fl_line_style:line_style
+@main;Drawing\nTests...;@d
+	@d;Images...;@di
+		@di;fltk3::Bitmap;bitmap
+		@di;fltk3::Pixmap;pixmap
+		@di;fltk3::RGB\n_Image;image
+		@di;fltk3::Shared\n_Image;pixmap_browser
+		@di;fltk3::Tiled\n_Image;tiled_image
+	@d;cursor;cursor
+	@d;labels;label
+	@d;rotated text;rotated_text
+	@d;fltk3::arc;arc
+	@d;fltk3::curve;curve
+	@d;fltk3::\nline_style;line_style
 
-@main:Events...:@u
-	@u:navigation:navigation
-	@u:minimum update:minimum
-	@u:keyboard:keyboard
-	@u:fast && slow widgets:fast_slow
-	@u:inactive:inactive
+@main;Events...;@u
+	@u;navigation;navigation
+	@u;minimum update;minimum
+	@u;keyboard;keyboard
+	@u;fast && slow widgets;fast_slow
+	@u;inactive;inactive
 
-@main:Fluid\n(UI design tool):../fluid/fluid valuators.fl
+@main;Fluid\n(UI design tool);../fluid/fluid valuators.fl
 
-@main:Cool\nDemos...:@e
-	@e:X Color\nBrowser:colbrowser
-	@e:Mandelbrot:mandelbrot
-	@e:Fractals:fractals
-	@e:Puzzle:glpuzzle
-	@e:Block\nAttack!:blocks
-	@e:Checkers:checkers
-	@e:Sudoku:sudoku
-	@e:Print\nsupport:device
+@main;Cool\nDemos...;@e
+	@e;X Color\nBrowser;colbrowser
+	@e;Mandelbrot;mandelbrot
+	@e;Fractals;fractals
+	@e;Puzzle;glpuzzle
+	@e;Block\nAttack!;blocks
+	@e;Checkers;checkers
+	@e;Sudoku;sudoku
+	@e;Print\nsupport;device
 
-@main:Other\nTests...:@o
-	@o:Color Choosers:color_chooser
-	@o:File Chooser:file_chooser
-	@o:Native File Chooser:native-filechooser
-	@o:Font Tests...:@of
-		@of:Fonts:fonts
-		@of:UTF-8:utf8
-	@o:HelpDialog:help
-	@o:Input Choice:input_choice
-	@o:Preferences:preferences
-	@o:Threading:threads
+@main;Other\nTests...;@o
+	@o;Color Choosers;color_chooser
+	@o;File Chooser;file_chooser
+	@o;Native File Chooser;native-filechooser
+	@o;Font Tests...;@of
+		@of;Fonts;fonts
+		@of;UTF-8;utf8
+	@o;HelpDialog;help
+	@o;Input Choice;input_choice
+	@o;Preferences;preferences
+	@o;Threading;threads
 
-@main:Tutorial\nfrom\nManual...:@j
-	@j:ask\n(modified):ask
-	@j:button:button
-	@j:CubeView:CubeView
-	@j:editor:editor editor.cxx
-	@j:hello:hello
-	@j:shape:shape
+@main;Tutorial\nfrom\nManual...;@j
+	@j;ask\n(modified);ask
+	@j;button;button
+	@j;CubeView;CubeView
+	@j;editor;editor editor.cxx
+	@j;hello;hello
+	@j;shape;shape
 
-@main:Images\nfor\nManual...:@i
-	@i:valuators:valuators
-	@i:symbols:symbols
-	@i:buttons:buttons
-	@i:clock:clock
-	@i:popups:message
-	@i:boxtypes:boxtype
+@main;Images\nfor\nManual...;@i
+	@i;valuators;valuators
+	@i;symbols;symbols
+	@i;buttons;buttons
+	@i;clock;clock
+	@i;popups;message
+	@i;boxtypes;boxtype

Modified: branches/branch-3.0/test/fractals.cxx
===================================================================
--- branches/branch-3.0/test/fractals.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/fractals.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -63,8 +63,8 @@
  *
  */
 
-#include <fltk3/glut.h>
-#include <fltk3/glu.h>
+#include <fltk3gl/glut.h>
+#include <fltk3gl/glu.h>
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: branches/branch-3.0/test/fracviewer.cxx
===================================================================
--- branches/branch-3.0/test/fracviewer.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/fracviewer.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -15,8 +15,8 @@
 #include <config.h>
 
 #if HAVE_GL && HAVE_GL_GLU_H
-#  include <fltk3/glut.h>
-#  include <fltk3/glu.h>
+#  include <fltk3gl/glut.h>
+#  include <fltk3gl/glu.h>
 
 #  include <stdio.h>
 #  include <stdlib.h>

Modified: branches/branch-3.0/test/fullscreen.cxx
===================================================================
--- branches/branch-3.0/test/fullscreen.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/fullscreen.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -31,7 +31,7 @@
 //
 // If it is a seperate window, turning double buffering on and off
 // will cause the window to raise, deiconize, and possibly move.  You
-// can avoid this by making the fltk3::GlWindow a child of a normal
+// can avoid this by making the fltk3::GLWindow a child of a normal
 // window.
 //
 // Copyright 1998-2010 by Bill Spitzak and others.
@@ -65,10 +65,10 @@
 #include <stdio.h>
 
 #if HAVE_GL
-#include <fltk3/gl.h>
-#include <fltk3/GlWindow.h>
+#include <fltk3gl/gl.h>
+#include <fltk3gl/GLWindow.h>
 
-class shape_window : public fltk3::GlWindow {
+class shape_window : public fltk3::GLWindow {
   void draw();
 public:
   int sides;
@@ -76,7 +76,7 @@
 };
 
 shape_window::shape_window(int x,int y,int w,int h,const char *l) :
-fltk3::GlWindow(x,y,w,h,l) {
+fltk3::GLWindow(x,y,w,h,l) {
   sides = 3;
 }
 

Modified: branches/branch-3.0/test/gl_overlay.cxx
===================================================================
--- branches/branch-3.0/test/gl_overlay.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/gl_overlay.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -43,10 +43,10 @@
   }
 };
 #else
-#include <fltk3/gl.h>
-#include <fltk3/GlWindow.h>
+#include <fltk3gl/gl.h>
+#include <fltk3gl/GLWindow.h>
 
-class shape_window : public fltk3::GlWindow {
+class shape_window : public fltk3::GLWindow {
   void draw();
   void draw_overlay();
 public:
@@ -56,7 +56,7 @@
 };
 
 shape_window::shape_window(int x,int y,int w,int h,const char *l) :
-fltk3::GlWindow(x,y,w,h,l) {
+fltk3::GLWindow(x,y,w,h,l) {
   sides = overlay_sides = 3;
 }
 

Modified: branches/branch-3.0/test/glpuzzle.cxx
===================================================================
--- branches/branch-3.0/test/glpuzzle.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/glpuzzle.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -46,8 +46,8 @@
 #include <sys/types.h>
 #include <time.h>
 #include <math.h>
-#include <fltk3/glut.h>	// changed for fltk
-#include <fltk3/glu.h>     // added for fltk
+#include <fltk3gl/glut.h>	// changed for fltk
+#include <fltk3gl/glu.h>     // added for fltk
 #include "trackball.c"	// changed from trackball.h for fltk
 
 #define WIDTH 4

Modified: branches/branch-3.0/test/makedepend
===================================================================
--- branches/branch-3.0/test/makedepend	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/makedepend	2011-08-25 11:40:26 UTC (rev 9010)
@@ -72,12 +72,12 @@
 blocks.o: ../include/fltk3/Device.h ../include/fltk3/Object.h
 blocks.o: ../include/fltk3/Plugin.h ../include/fltk3/Image.h
 blocks.o: ../include/fltk3/Bitmap.h ../include/fltk3/Pixmap.h
-blocks.o: ../include/fltk3/RGBImage.h pixmaps/blast.xpm pixmaps/red.xpm
-blocks.o: pixmaps/red_bomb.xpm pixmaps/green.xpm pixmaps/green_bomb.xpm
-blocks.o: pixmaps/blue.xpm pixmaps/blue_bomb.xpm pixmaps/yellow.xpm
-blocks.o: pixmaps/yellow_bomb.xpm pixmaps/cyan.xpm pixmaps/cyan_bomb.xpm
-blocks.o: pixmaps/magenta.xpm pixmaps/magenta_bomb.xpm pixmaps/gray.xpm
-blocks.o: pixmaps/gray_bomb.xpm
+blocks.o: ../include/fltk3/RGBImage.h ../include/config.h pixmaps/blast.xpm
+blocks.o: pixmaps/red.xpm pixmaps/red_bomb.xpm pixmaps/green.xpm
+blocks.o: pixmaps/green_bomb.xpm pixmaps/blue.xpm pixmaps/blue_bomb.xpm
+blocks.o: pixmaps/yellow.xpm pixmaps/yellow_bomb.xpm pixmaps/cyan.xpm
+blocks.o: pixmaps/cyan_bomb.xpm pixmaps/magenta.xpm pixmaps/magenta_bomb.xpm
+blocks.o: pixmaps/gray.xpm pixmaps/gray_bomb.xpm
 boxtype.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 boxtype.o: ../include/fltk3/Export.h ../include/fltk3/types.h
 boxtype.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
@@ -117,6 +117,7 @@
 buttons.o: ../include/fltk3/run.h ../include/fltk3/CheckButton.h
 buttons.o: ../include/fltk3/LightButton.h ../include/fltk3/LightButton.h
 buttons.o: ../include/fltk3/RoundButton.h ../include/fltk3/Tooltip.h
+buttons.o: ../include/fltk3/Box.h
 checkers.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 checkers.o: ../include/fltk3/Export.h ../include/fltk3/types.h
 checkers.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
@@ -193,26 +194,25 @@
 cube.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
 cube.o: ../include/fltk3/RadioLightButton.h ../include/fltk3/LightButton.h
 cube.o: ../include/fltk3/Button.h ../include/fltk3/Slider.h
-cube.o: ../include/fltk3/Valuator.h ../include/fltk3/GlWindow.h
+cube.o: ../include/fltk3/Valuator.h ../include/fltk3gl/GLWindow.h
+cube.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+cube.o: ../include/fltk3/SysMenuBar.h ../include/fltk3/MenuBar.h
+cube.o: ../include/fltk3/Menu_.h ../include/fltk3/MenuItem.h
+cube.o: ../include/fltk3/Image.h ../include/fltk3/x.h
 cube.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
-cube.o: ../include/fltk3/gl.h ../include/fltk3/SysMenuBar.h
-cube.o: ../include/fltk3/MenuBar.h ../include/fltk3/Menu_.h
-cube.o: ../include/fltk3/MenuItem.h ../include/fltk3/Image.h
-cube.o: ../include/fltk3/x.h ../include/fltk3/Printer.h ../include/fltk3/x.h
+cube.o: ../include/fltk3/Printer.h ../include/fltk3/x.h
 cube.o: ../include/fltk3/PagedDevice.h ../include/fltk3/Device.h
 cube.o: ../include/fltk3/Object.h ../include/fltk3/Plugin.h
 cube.o: ../include/fltk3/Preferences.h ../include/fltk3/Image.h
 cube.o: ../include/fltk3/Bitmap.h ../include/fltk3/Pixmap.h
 cube.o: ../include/fltk3/RGBImage.h ../include/fltk3/draw.h
-cube.o: ../include/fltk3/enumerations.h ../include/fltk3/PostScript.h
+cube.o: ../include/fltk3/PostScript.h
 CubeView.o: CubeView.h ../include/config.h ../include/fltk3/run.h
 CubeView.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
 CubeView.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
-CubeView.o: ../include/fltk3/enumerations.h ../include/fltk3/GlWindow.h
-CubeView.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
-CubeView.o: ../include/fltk3/Widget.h ../include/fltk3/Rectangle.h
-CubeView.o: ../include/fltk3/Object.h ../include/fltk3/Wrapper.h
-CubeView.o: ../include/fltk3/Widget.h ../include/fltk3/gl.h
+CubeView.o: ../include/fltk3/enumerations.h ../include/fltk3gl/GlWindow.h
+CubeView.o: ../include/fltk3/Window.h ../include/fltk3gl/gl.h
+CubeView.o: ../include/fltk3/enumerations.h
 CubeMain.o: ../include/config.h ../include/fltk3/run.h
 CubeMain.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
 CubeMain.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
@@ -223,8 +223,9 @@
 CubeMain.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
 CubeMain.o: ../include/fltk3/Group.h ../include/fltk3/Roller.h
 CubeMain.o: ../include/fltk3/Valuator.h ../include/fltk3/Slider.h
-CubeMain.o: ../include/fltk3/Box.h CubeView.h ../include/fltk3/GlWindow.h
-CubeMain.o: ../include/fltk3/gl.h ../include/fltk3/ValueSlider.h
+CubeMain.o: ../include/fltk3/Box.h CubeView.h ../include/fltk3gl/GlWindow.h
+CubeMain.o: ../include/fltk3/Window.h ../include/fltk3gl/gl.h
+CubeMain.o: ../include/fltk3/enumerations.h ../include/fltk3/ValueSlider.h
 CubeMain.o: ../include/fltk3/Slider.h
 cursor.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 cursor.o: ../include/fltk3/Export.h ../include/fltk3/types.h
@@ -381,23 +382,23 @@
 fonts.o: ../include/fltk3/Image.h ../include/fltk3/Bitmap.h
 fonts.o: ../include/fltk3/Pixmap.h ../include/fltk3/RGBImage.h
 fonts.o: ../include/fltk3/Box.h ../include/fltk3/ask.h
-fractals.o: ../include/config.h ../include/fltk3/glut.h ../include/fltk3/gl.h
-fractals.o: ../include/fltk3/enumerations.h ../include/fltk3/Export.h
-fractals.o: ../include/fltk3/types.h ../include/fltk3/run.h
-fractals.o: ../include/fltk3/GlWindow.h ../include/fltk3/Window.h
-fractals.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
-fractals.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
-fractals.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
-fractals.o: ../include/fltk3/glu.h fracviewer.h ../include/fltk3/Button.h
-fractals.o: ../include/fltk3/Group.h ../include/fltk3/Window.h
-fracviewer.o: ../include/config.h ../include/fltk3/glut.h
-fracviewer.o: ../include/fltk3/gl.h ../include/fltk3/enumerations.h
+fractals.o: ../include/config.h ../include/fltk3gl/glut.h
+fractals.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+fractals.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+fractals.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+fractals.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
+fractals.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
+fractals.o: ../include/fltk3gl/glu.h fracviewer.h ../include/fltk3/Button.h
+fractals.o: ../include/fltk3/Widget.h ../include/fltk3/Rectangle.h
+fractals.o: ../include/fltk3/Object.h ../include/fltk3/Wrapper.h
+fractals.o: ../include/fltk3/Widget.h ../include/fltk3/Group.h
+fracviewer.o: ../include/config.h ../include/fltk3gl/glut.h
+fracviewer.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+fracviewer.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 fracviewer.o: ../include/fltk3/Export.h ../include/fltk3/types.h
-fracviewer.o: ../include/fltk3/run.h ../include/fltk3/GlWindow.h
-fracviewer.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
-fracviewer.o: ../include/fltk3/Widget.h ../include/fltk3/Rectangle.h
-fracviewer.o: ../include/fltk3/Object.h ../include/fltk3/Wrapper.h
-fracviewer.o: ../include/fltk3/Widget.h ../include/fltk3/glu.h fracviewer.h
+fracviewer.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
+fracviewer.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
+fracviewer.o: ../include/fltk3gl/glu.h fracviewer.h
 fullscreen.o: ../include/config.h ../include/fltk3/run.h
 fullscreen.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
 fullscreen.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
@@ -408,7 +409,8 @@
 fullscreen.o: ../include/fltk3/Widget.h ../include/fltk3/HorSlider.h
 fullscreen.o: ../include/fltk3/Slider.h ../include/fltk3/Valuator.h
 fullscreen.o: ../include/fltk3/LightButton.h ../include/fltk3/math.h
-fullscreen.o: ../include/fltk3/gl.h ../include/fltk3/GlWindow.h
+fullscreen.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+fullscreen.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
 gl_overlay.o: ../include/config.h ../include/fltk3/run.h
 gl_overlay.o: ../include/fltk3/utf8.h ../include/fltk3/Export.h
 gl_overlay.o: ../include/fltk3/types.h ../include/fltk3/Xutf8.h
@@ -417,18 +419,15 @@
 gl_overlay.o: ../include/fltk3/Valuator.h ../include/fltk3/Widget.h
 gl_overlay.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
 gl_overlay.o: ../include/fltk3/ToggleButton.h ../include/fltk3/Button.h
-gl_overlay.o: ../include/fltk3/math.h ../include/fltk3/gl.h
-gl_overlay.o: ../include/fltk3/GlWindow.h ../include/fltk3/Window.h
-gl_overlay.o: ../include/fltk3/Group.h ../include/fltk3/Wrapper.h
-gl_overlay.o: ../include/fltk3/Widget.h
-glpuzzle.o: ../include/config.h ../include/fltk3/glut.h ../include/fltk3/gl.h
-glpuzzle.o: ../include/fltk3/enumerations.h ../include/fltk3/Export.h
-glpuzzle.o: ../include/fltk3/types.h ../include/fltk3/run.h
-glpuzzle.o: ../include/fltk3/GlWindow.h ../include/fltk3/Window.h
-glpuzzle.o: ../include/fltk3/Group.h ../include/fltk3/Widget.h
-glpuzzle.o: ../include/fltk3/Rectangle.h ../include/fltk3/Object.h
-glpuzzle.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
-glpuzzle.o: ../include/fltk3/glu.h trackball.c trackball.h
+gl_overlay.o: ../include/fltk3/math.h ../include/fltk3gl/gl.h
+gl_overlay.o: ../include/fltk3/enumerations.h ../include/fltk3gl/GLWindow.h
+glpuzzle.o: ../include/config.h ../include/fltk3gl/glut.h
+glpuzzle.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+glpuzzle.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
+glpuzzle.o: ../include/fltk3/Export.h ../include/fltk3/types.h
+glpuzzle.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
+glpuzzle.o: ../include/fltk3gl/GLWindow.h ../include/fltk3/Window.h
+glpuzzle.o: ../include/fltk3gl/glu.h trackball.c trackball.h
 hello.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 hello.o: ../include/fltk3/Export.h ../include/fltk3/types.h
 hello.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h
@@ -787,9 +786,8 @@
 shape.o: ../include/fltk3/Slider.h ../include/fltk3/Valuator.h
 shape.o: ../include/fltk3/Widget.h ../include/fltk3/Rectangle.h
 shape.o: ../include/fltk3/Object.h ../include/fltk3/math.h
-shape.o: ../include/fltk3/gl.h ../include/fltk3/GlWindow.h
-shape.o: ../include/fltk3/Window.h ../include/fltk3/Group.h
-shape.o: ../include/fltk3/Wrapper.h ../include/fltk3/Widget.h
+shape.o: ../include/fltk3gl/gl.h ../include/fltk3/enumerations.h
+shape.o: ../include/fltk3gl/GLWindow.h
 subwindow.o: ../include/fltk3/run.h ../include/fltk3/utf8.h
 subwindow.o: ../include/fltk3/Export.h ../include/fltk3/types.h
 subwindow.o: ../include/fltk3/Xutf8.h ../include/fltk3/enumerations.h

Modified: branches/branch-3.0/test/shape.cxx
===================================================================
--- branches/branch-3.0/test/shape.cxx	2011-08-25 10:53:58 UTC (rev 9009)
+++ branches/branch-3.0/test/shape.cxx	2011-08-25 11:40:26 UTC (rev 9010)
@@ -33,10 +33,10 @@
 
 #if HAVE_GL
 
-#include <fltk3/gl.h>
-#include <fltk3/GlWindow.h>
+#include <fltk3gl/gl.h>
+#include <fltk3gl/GLWindow.h>
 
-class shape_window : public fltk3::GlWindow {
+class shape_window : public fltk3::GLWindow {
   void draw();
 public:
   int sides;
@@ -44,7 +44,7 @@
 };
 
 shape_window::shape_window(int x,int y,int w,int h,const char *l) :
-fltk3::GlWindow(x,y,w,h,l) {
+fltk3::GLWindow(x,y,w,h,l) {
   sides = 3;
 }
 

Direct Link to Message ]
 
bottom left image   bottom right image
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2022 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.