From 82960c272bc52eca1371931678927c47a3de5c61 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 21 Sep 2014 14:38:10 +0000
Subject: Replaced Fl_Shaped_Window.cxx by Fl_Window_shape.cxx in VisualC
 files.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10326 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 ide/VisualC2008/fltk.lib.vcproj          | 86 +++++++++++++++-----------------
 ide/VisualC2008/fltkdll.vcproj           | 78 ++++++++++++++---------------
 ide/VisualC2010/fltk.lib.vcxproj         | 35 +++++++------
 ide/VisualC2010/fltk.lib.vcxproj.filters |  5 +-
 ide/VisualC2010/fltkdll.vcxproj          | 24 ++++-----
 ide/VisualC6/fltk.dsp                    |  8 +--
 ide/VisualC6/fltkdll.dsp                 |  8 +--
 7 files changed, 118 insertions(+), 126 deletions(-)

diff --git a/ide/VisualC2008/fltk.lib.vcproj b/ide/VisualC2008/fltk.lib.vcproj
index a6e5aa845..7bb7899cc 100644
--- a/ide/VisualC2008/fltk.lib.vcproj
+++ b/ide/VisualC2008/fltk.lib.vcproj
@@ -655,10 +655,6 @@
 				RelativePath="..\..\FL\Fl_Select_Browser.H"
 				>
 			</File>
-			<File
-				RelativePath="..\..\FL\Fl_Shaped_Window.H"
-				>
-			</File>
 			<File
 				RelativePath="..\..\FL\Fl_Shared_Image.H"
 				>
@@ -5390,8 +5386,8 @@
 				/>
 			</FileConfiguration>
 		</File>
-			<File
-			RelativePath="..\..\src\Fl_Shaped_Window.cxx"
+	<File
+			RelativePath="..\..\src\Fl_Shared_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5436,8 +5432,8 @@
 				/>
 			</FileConfiguration>
 		</File>
-	<File
-			RelativePath="..\..\src\Fl_Shared_Image.cxx"
+		<File
+			RelativePath="..\..\src\fl_shortcut.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5483,7 +5479,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_shortcut.cxx"
+			RelativePath="..\..\src\fl_show_colormap.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5529,7 +5525,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_show_colormap.cxx"
+			RelativePath="..\..\src\Fl_Single_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5575,7 +5571,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Single_Window.cxx"
+			RelativePath="..\..\src\Fl_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5621,7 +5617,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Slider.cxx"
+			RelativePath="..\..\src\fl_symbols.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5667,7 +5663,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_symbols.cxx"
+			RelativePath="..\..\src\Fl_Table.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5713,7 +5709,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Table.cxx"
+			RelativePath="..\..\src\Fl_Table_Row.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5759,7 +5755,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Table_Row.cxx"
+			RelativePath="..\..\src\Fl_Tabs.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5805,7 +5801,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tabs.cxx"
+			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5851,7 +5847,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
+			RelativePath="..\..\src\Fl_Text_Display.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5897,7 +5893,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Text_Display.cxx"
+			RelativePath="..\..\src\Fl_Text_Editor.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5943,7 +5939,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Text_Editor.cxx"
+			RelativePath="..\..\src\Fl_Tile.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5989,7 +5985,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tile.cxx"
+			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6035,7 +6031,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
+			RelativePath="..\..\src\Fl_Tooltip.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6081,7 +6077,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tooltip.cxx"
+			RelativePath="..\..\src\Fl_Tree.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6127,7 +6123,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree.cxx"
+			RelativePath="..\..\src\Fl_Tree_Item.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6173,7 +6169,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree_Item.cxx"
+			RelativePath="..\..\src\Fl_Tree_Item_Array.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6219,7 +6215,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree_Item_Array.cxx"
+			RelativePath="..\..\src\Fl_Tree_Prefs.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6265,7 +6261,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree_Prefs.cxx"
+			RelativePath="..\..\src\fl_utf.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_utf8.cxx"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Valuator.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6311,15 +6315,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_utf.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\fl_utf8.cxx"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\Fl_Valuator.cxx"
+			RelativePath="..\..\src\Fl_Value_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6365,7 +6361,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Value_Input.cxx"
+			RelativePath="..\..\src\Fl_Value_Output.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6411,7 +6407,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Value_Output.cxx"
+			RelativePath="..\..\src\Fl_Value_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6457,7 +6453,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Value_Slider.cxx"
+			RelativePath="..\..\src\fl_vertex.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6503,7 +6499,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_vertex.cxx"
+			RelativePath="..\..\src\Fl_visual.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6549,7 +6545,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_visual.cxx"
+			RelativePath="..\..\src\Fl_Widget.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6595,7 +6591,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Widget.cxx"
+			RelativePath="..\..\src\Fl_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6641,7 +6637,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window.cxx"
+			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6687,7 +6683,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
+			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6733,7 +6729,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
+			RelativePath="..\..\src\Fl_Window_iconize.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6779,7 +6775,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window_iconize.cxx"
+			RelativePath="..\..\src\Fl_Window_shape.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/ide/VisualC2008/fltkdll.vcproj b/ide/VisualC2008/fltkdll.vcproj
index 639c967d4..9d9a2cfc3 100644
--- a/ide/VisualC2008/fltkdll.vcproj
+++ b/ide/VisualC2008/fltkdll.vcproj
@@ -5048,7 +5048,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Shaped_Window.cxx"
+			RelativePath="..\..\src\Fl_Shared_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5090,7 +5090,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Shared_Image.cxx"
+			RelativePath="..\..\src\fl_shortcut.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5132,7 +5132,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_shortcut.cxx"
+			RelativePath="..\..\src\fl_show_colormap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5174,7 +5174,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_show_colormap.cxx"
+			RelativePath="..\..\src\Fl_Single_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5216,7 +5216,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Single_Window.cxx"
+			RelativePath="..\..\src\Fl_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5258,7 +5258,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Slider.cxx"
+			RelativePath="..\..\src\fl_symbols.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5300,7 +5300,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_symbols.cxx"
+			RelativePath="..\..\src\Fl_Table.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5342,7 +5342,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Table.cxx"
+			RelativePath="..\..\src\Fl_Table_Row.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5384,7 +5384,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Table_Row.cxx"
+			RelativePath="..\..\src\Fl_Tabs.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5426,7 +5426,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tabs.cxx"
+			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5468,7 +5468,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
+			RelativePath="..\..\src\Fl_Text_Display.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5510,7 +5510,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Text_Display.cxx"
+			RelativePath="..\..\src\Fl_Text_Editor.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5552,7 +5552,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Text_Editor.cxx"
+			RelativePath="..\..\src\Fl_Tile.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5594,7 +5594,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tile.cxx"
+			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5636,7 +5636,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
+			RelativePath="..\..\src\Fl_Tooltip.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5678,7 +5678,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tooltip.cxx"
+			RelativePath="..\..\src\Fl_Tree.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5720,7 +5720,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree.cxx"
+			RelativePath="..\..\src\Fl_Tree_Item.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5762,7 +5762,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree_Item.cxx"
+			RelativePath="..\..\src\Fl_Tree_Item_Array.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5804,7 +5804,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree_Item_Array.cxx"
+			RelativePath="..\..\src\Fl_Tree_Prefs.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5846,7 +5846,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Tree_Prefs.cxx"
+			RelativePath="..\..\src\fl_utf.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\fl_utf8.cxx"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\Fl_Valuator.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5888,15 +5896,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_utf.c"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\fl_utf8.cxx"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\Fl_Valuator.cxx"
+			RelativePath="..\..\src\Fl_Value_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5938,7 +5938,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Value_Input.cxx"
+			RelativePath="..\..\src\Fl_Value_Output.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5980,7 +5980,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Value_Output.cxx"
+			RelativePath="..\..\src\Fl_Value_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6022,7 +6022,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Value_Slider.cxx"
+			RelativePath="..\..\src\fl_vertex.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6064,7 +6064,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\fl_vertex.cxx"
+			RelativePath="..\..\src\Fl_visual.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6106,7 +6106,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_visual.cxx"
+			RelativePath="..\..\src\Fl_Widget.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6148,7 +6148,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Widget.cxx"
+			RelativePath="..\..\src\Fl_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6190,7 +6190,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window.cxx"
+			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6232,7 +6232,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
+			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6274,7 +6274,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
+			RelativePath="..\..\src\Fl_Window_iconize.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6316,7 +6316,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\src\Fl_Window_iconize.cxx"
+			RelativePath="..\..\src\Fl_Window_shape.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/ide/VisualC2010/fltk.lib.vcxproj b/ide/VisualC2010/fltk.lib.vcxproj
index 9f9c740ec..5533a545c 100644
--- a/ide/VisualC2010/fltk.lib.vcxproj
+++ b/ide/VisualC2010/fltk.lib.vcxproj
@@ -256,7 +256,6 @@
     <ClInclude Include="..\..\FL\Fl_Scrollbar.H" />
     <ClInclude Include="..\..\FL\Fl_Secret_Input.H" />
     <ClInclude Include="..\..\FL\Fl_Select_Browser.H" />
-    <ClInclude Include="..\..\FL\Fl_Shaped_Window.H" />
     <ClInclude Include="..\..\FL\Fl_Shared_Image.H" />
     <ClInclude Include="..\..\FL\fl_show_colormap.H" />
     <ClInclude Include="..\..\FL\fl_show_input.H" />
@@ -1872,22 +1871,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-     <ClCompile Include="..\..\src\Fl_Shaped_Window.cxx">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">Neither</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Neither</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
    <ClCompile Include="..\..\src\Fl_Shared_Image.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -2370,7 +2353,23 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\Fl_Wizard.cxx">
+    <ClCompile Include="..\..\src\Fl_Window_shape.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">true</BrowseInformation>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">Neither</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Neither</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+   <ClCompile Include="..\..\src\Fl_Wizard.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/ide/VisualC2010/fltk.lib.vcxproj.filters b/ide/VisualC2010/fltk.lib.vcxproj.filters
index 98894893a..e49f691a8 100644
--- a/ide/VisualC2010/fltk.lib.vcxproj.filters
+++ b/ide/VisualC2010/fltk.lib.vcxproj.filters
@@ -268,9 +268,6 @@
     <ClInclude Include="..\..\FL\Fl_Select_Browser.H">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\FL\Fl_Shaped_Window.H">
-      <Filter>Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\FL\Fl_Shared_Image.H">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -485,7 +482,6 @@
     <ClCompile Include="..\..\src\fl_set_font.cxx" />
     <ClCompile Include="..\..\src\fl_set_fonts.cxx" />
     <ClCompile Include="..\..\src\fl_shadow_box.cxx" />
-    <ClCompile Include="..\..\src\Fl_Shaped_Window.cxx" />
     <ClCompile Include="..\..\src\Fl_Shared_Image.cxx" />
     <ClCompile Include="..\..\src\fl_shortcut.cxx" />
     <ClCompile Include="..\..\src\fl_show_colormap.cxx" />
@@ -518,6 +514,7 @@
     <ClCompile Include="..\..\src\Fl_Window_fullscreen.cxx" />
     <ClCompile Include="..\..\src\Fl_Window_hotspot.cxx" />
     <ClCompile Include="..\..\src\Fl_Window_iconize.cxx" />
+    <ClCompile Include="..\..\src\Fl_Window_shape.cxx" />
     <ClCompile Include="..\..\src\Fl_Wizard.cxx" />
     <ClCompile Include="..\..\src\Fl_x.cxx" />
     <ClCompile Include="..\..\src\Fl_XBM_Image.cxx" />
diff --git a/ide/VisualC2010/fltkdll.vcxproj b/ide/VisualC2010/fltkdll.vcxproj
index 07beb1cf9..bdc27fdcb 100644
--- a/ide/VisualC2010/fltkdll.vcxproj
+++ b/ide/VisualC2010/fltkdll.vcxproj
@@ -1564,18 +1564,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\Fl_Shaped_Window.cxx">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\src\Fl_Shared_Image.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1938,6 +1926,18 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\..\src\Fl_Window_shape.cxx">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Cairo|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\src\Fl_Wizard.cxx">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/ide/VisualC6/fltk.dsp b/ide/VisualC6/fltk.dsp
index 6b0b4036d..5b29aca64 100644
--- a/ide/VisualC6/fltk.dsp
+++ b/ide/VisualC6/fltk.dsp
@@ -519,10 +519,6 @@ SOURCE=..\..\src\fl_shadow_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\Fl_Shaped_Window.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\Fl_Shared_Image.cxx
 # End Source File
 # Begin Source File
@@ -651,6 +647,10 @@ SOURCE=..\..\src\Fl_Window_iconize.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Window_shape.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Wizard.cxx
 # End Source File
 # Begin Source File
diff --git a/ide/VisualC6/fltkdll.dsp b/ide/VisualC6/fltkdll.dsp
index 244c81994..5a6088034 100644
--- a/ide/VisualC6/fltkdll.dsp
+++ b/ide/VisualC6/fltkdll.dsp
@@ -537,10 +537,6 @@ SOURCE=..\..\src\fl_shadow_box.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\Fl_Shaped_Window.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\Fl_Shared_Image.cxx
 # End Source File
 # Begin Source File
@@ -669,6 +665,10 @@ SOURCE=..\..\src\Fl_Window_iconize.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\Fl_Window_shape.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\Fl_Wizard.cxx
 # End Source File
 # Begin Source File
-- 
cgit v1.2.3