using button impl

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

diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj
index c1adaf34366b0ed515d94e0d1f23b99a006b9e45..1b1d8ecc7be37ec935b85bd05d09a828675b7c48 100644 (file)
--- a/build/msw/wx_vc7_ribbon.vcproj
+++ b/build/msw/wx_vc7_ribbon.vcproj
@@ -273,7 +273,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswuddll\ribbon\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswuddll\ribbon\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -304,7 +304,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                                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_ribbondll.pch"\r
                                ObjectFile="vc_mswudll\ribbon\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswudll\ribbon\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r


@@ -371,7 +371,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                                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_ribbondll.pch"\r
                                ObjectFile="vc_mswunivuddll\ribbon\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivuddll\ribbon\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -439,7 +439,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                                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_ribbondll.pch"\r
                                ObjectFile="vc_mswunivudll\ribbon\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivudll\ribbon\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r

-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r


@@ -506,7 +506,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                                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


@@ -798,6 +798,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_ribbon.h">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Source Files"\r
                </Filter>\r
                <Filter\r
                        Name="Source Files"\r


@@ -833,6 +836,9 @@
                        <File\r
                                RelativePath="..\..\src\ribbon\toolbar.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\ribbon\toolbar.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_ribbon.cpp">\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r