Move wxTopLevelWindow::SetShape() down to wxNonOwnedWindow.

[wxWidgets.git] / build / msw / wx_vc7_richtext.vcproj

diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj
index bcff5ec64a259ecd034db852224c9cc9f2b63c3b..94ed2f5db948a7d63d5b98be51a55230711f6402 100644 (file)
--- a/build/msw/wx_vc7_richtext.vcproj
+++ b/build/msw/wx_vc7_richtext.vcproj
@@ -273,7 +273,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -284,13 +284,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
@@ -304,7 +304,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
@@ -338,7 +338,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -349,13 +349,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
@@ -371,7 +371,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
@@ -408,7 +408,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -419,13 +419,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
@@ -439,7 +439,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
@@ -473,7 +473,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -484,13 +484,13 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
@@ -506,7 +506,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\r
@@ -610,8 +610,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32">\r
@@ -619,8 +618,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"/>\r
@@ -632,8 +630,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32">\r
@@ -641,8 +638,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"/>\r
@@ -661,8 +657,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32">\r
@@ -670,8 +665,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"/>\r
@@ -683,8 +677,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Release|Win32">\r
@@ -692,8 +685,7 @@
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
                                                CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r
                                </FileConfiguration>\r
                        </File>\r
                </Filter>\r
@@ -779,12 +771,27 @@
                <Filter\r
                        Name="Common Headers"\r
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextborderspage.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextbuffer.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbulletspage.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextctrl.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextdialogpage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextfontpage.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">\r
                        </File>\r
@@ -794,18 +801,36 @@
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextimagedlg.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextindentspage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextliststylepage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextmarginspage.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextprint.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextsizepage.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextstylepage.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextstyles.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
                        </File>\r