[Git][wxwidgets/wxwidgets][master] 11 commits: Initialize MyFrame members in the declarations in treectrl sample

[Vadim Zeitlin (@_VZ_)]

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets


Commits:
92f64b04 by Vadim Zeitlin at 2026-01-27T23:14:08+01:00
Initialize MyFrame members in the declarations in treectrl sample

Also initialize m_panel to nullptr as well, if only for consistency.

No real changes.

- - - - -
04d587a0 by Vadim Zeitlin at 2026-01-27T23:14:44+01:00
Initialize MyTreeCtrl members in their declarations too

No real changes.

- - - - -
56b18f64 by Vadim Zeitlin at 2026-01-27T23:44:42+01:00
Move TreeCtrlIcon_XXX enum out of MyTreeCtrl

Using both "MyTreeCtrl::" and "TreeCtrlIcon_" prefix seems redundant.

No real changes.

- - - - -
9b312abc by Vadim Zeitlin at 2026-01-28T01:10:33+01:00
Add wxIMPLEMENT_DYNAMIC_TEMPLATE_SPECIALIZATION()

This will be used in the upcoming commit.

- - - - -
9330da3c by Vadim Zeitlin at 2026-01-28T01:10:33+01:00
Use Bind() instead of event table for MyTreeCtrl

This is more type safe and also will be easier to update when MyTreeCtrl
becomes a template class in the next commit.

Also use Create() instead of non-default ctor in this class, it didn't
make sense to have both ctors overloads.

- - - - -
1d8173ea by Vadim Zeitlin at 2026-01-28T01:10:33+01:00
Allow using either native or generic wxTreeCtrl in the sample

Implement dynamic selection of the tree control to use for the platforms
where both native and generic versions are available.

This facilitates testing and comparing the behaviour of 2 controls.

Note that although there are a lot of changes here, many of them just
add "this->" to the existing code in order to use qualified lookup to
find wxTreeCtrlBase symbols that were found by unqualified lookup before
but wouldn't be found any longer now that this code is in a template
class.

- - - - -
22e93d72 by Vadim Zeitlin at 2026-01-28T01:10:33+01:00
Map wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT to LISTBOXTEST in wxMSW

This is a better value for this colour than the previously used
wxSYS_COLOUR_HIGHLIGHTTEXT which doesn't provide good enough contrast
with the background of the selected items.

Also mention that this colour should provide good contrast in this case.

See #26118.

- - - - -
72c9f7eb by Vadim Zeitlin at 2026-01-28T01:10:33+01:00
Don't use wxSYS_COLOUR_HIGHLIGHTTEXT for selected items

Always use wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT for the selected items in
the generic implementations of wxListCtrl and wxTreeCtrl as this colour
provides good contrast with the background used for these items, unlike
the one used before.

Closes #26118.

- - - - -
4788cf98 by Vadim Zeitlin at 2026-01-28T01:10:33+01:00
Improve drawing selected items background in wxMSW dark mode

Use DarkMode::LISTVIEW theme which at least uses medium-dark blue
(#15539E) instead of the very light blue (#CCE8FF) used in the light
mode which was used before and was really inappropriate for dark mode.

- - - - -
3d88038d by PB at 2026-01-29T23:04:01+01:00
Add support for MSVS 2026

Update wx_config.props, add MSVS 2026 solutions for the library
and samples, and update the docs.

Closes #26131.

- - - - -
21b5e055 by Vadim Zeitlin at 2026-01-30T00:08:18+01:00
Merge branch 'generic-treectrl-col'

Show generic wxTreeCtrl in the sample and improve its colours under MSW,
in both light and dark mode (although the latter could/should still be
improved to be made more similar to the native control).

See #26123.

- - - - -


14 changed files:

- README.md
- build/msw/wx_config.props
- + build/msw/wx_vc18.slnx
- docs/msw/install.md
- include/wx/rtti.h
- interface/wx/object.h
- interface/wx/settings.h
- + samples/samples_vc18.slnx
- samples/treectrl/treetest.cpp
- samples/treectrl/treetest.h
- src/generic/listctrl.cpp
- src/generic/treectlg.cpp
- src/msw/renderer.cpp
- src/msw/settings.cpp


Changes:

=====================================
README.md
=====================================
@@ -35,7 +35,7 @@ This version of wxWidgets supports the following primary platforms:

All C++11 compilers are supported including but not limited to:

-- Microsoft Visual C++ 2015 or later (up to 2022).
+- Microsoft Visual C++ 2015 or later (up to 2026).
- g++ 4.8 or later (up to 15), including MinGW/MinGW-64/TDM under Windows.
- Clang (up to 19/Xcode 16).



=====================================
build/msw/wx_config.props
=====================================
@@ -7,6 +7,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
+ <PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v145</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(VisualStudioVersion)' >= '15.0' and '$(WindowsTargetPlatformVersion)'==''">
<!-- Latest Target Version property -->


=====================================
build/msw/wx_vc18.slnx
=====================================
@@ -0,0 +1,87 @@
+<Solution>
+ <Configurations>
+ <BuildType Name="Debug" />
+ <BuildType Name="DLL Debug" />
+ <BuildType Name="DLL Release" />
+ <BuildType Name="Release" />
+ <Platform Name="ARM64" />
+ <Platform Name="ARM64EC" />
+ <Platform Name="Win32" />
+ <Platform Name="x64" />
+ </Configurations>
+ <Project Path="wx_adv.vcxproj" Id="24c45343-fd20-5c92-81c1-35a2ae841e79">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_aui.vcxproj" Id="a16d3832-0f42-57ce-8f48-50e06649ade8">
+ <BuildDependency Project="wx_core.vcxproj" />
+ <BuildDependency Project="wx_html.vcxproj" />
+ </Project>
+ <Project Path="wx_base.vcxproj" Id="3fcc50c2-81e9-5db2-b8d8-2129427568b1">
+ <BuildDependency Project="wx_custom_build.vcxproj" />
+ <BuildDependency Project="wx_wxexpat.vcxproj" />
+ <BuildDependency Project="wx_wxregex.vcxproj" />
+ <BuildDependency Project="wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="wx_core.vcxproj" Id="6744dad8-9c70-574a-bff2-9f8dddb24a75">
+ <BuildDependency Project="wx_base.vcxproj" />
+ <BuildDependency Project="wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="wx_wxpng.vcxproj" />
+ <BuildDependency Project="wx_wxtiff.vcxproj" />
+ <BuildDependency Project="wx_wxwebp.vcxproj" />
+ </Project>
+ <Project Path="wx_custom_build.vcxproj" Id="01f4ce10-2cfb-41a8-b41f-e54337868a1d" />
+ <Project Path="wx_gl.vcxproj" Id="da8b15ef-6750-5928-bc0e-c748213cf9b2">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_html.vcxproj" Id="33cc42f9-7756-5587-863c-8d4461b7c5dd">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_media.vcxproj" Id="8bd8f8d9-4275-5b42-a8f4-f1db2970a550">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_net.vcxproj" Id="69f2ede4-7d21-5738-9bc0-f66f61c9ae00">
+ <BuildDependency Project="wx_base.vcxproj" />
+ </Project>
+ <Project Path="wx_propgrid.vcxproj" Id="97fdab45-9c58-5bc5-a2f4-ee42739ebc63">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_qa.vcxproj" Id="e21129e0-7c08-5936-9d8c-0d60b5319ba7">
+ <BuildDependency Project="wx_core.vcxproj" />
+ <BuildDependency Project="wx_xml.vcxproj" />
+ </Project>
+ <Project Path="wx_ribbon.vcxproj" Id="87b42a9c-3f5c-53d7-9017-2b1cae39457d">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_richtext.vcxproj" Id="7fb0902d-8579-5dce-b883-daf66a885005">
+ <BuildDependency Project="wx_core.vcxproj" />
+ <BuildDependency Project="wx_html.vcxproj" />
+ <BuildDependency Project="wx_xml.vcxproj" />
+ </Project>
+ <Project Path="wx_stc.vcxproj" Id="23e1c437-a951-5943-8639-a17f3cf2e606">
+ <BuildDependency Project="wx_core.vcxproj" />
+ <BuildDependency Project="wx_wxlexilla.vcxproj" />
+ <BuildDependency Project="wx_wxscintilla.vcxproj" />
+ </Project>
+ <Project Path="wx_webview.vcxproj" Id="a8e8442a-078a-5fc5-b495-8d71ba77ee6e">
+ <BuildDependency Project="wx_core.vcxproj" />
+ </Project>
+ <Project Path="wx_wxexpat.vcxproj" Id="a1a8355b-0988-528e-9cc2-b971d6266669" />
+ <Project Path="wx_wxjpeg.vcxproj" Id="6053cc38-cdee-584c-8bc8-4b000d800fc7" />
+ <Project Path="wx_wxlexilla.vcxproj" Id="812eddee-840f-4807-a732-8a0b81409f39" />
+ <Project Path="wx_wxpng.vcxproj" Id="8acc122a-ca6a-5aa6-9c97-9cdd2e533db0" />
+ <Project Path="wx_wxregex.vcxproj" Id="56a4b526-bb81-5d01-aaa9-16d23bbb169d">
+ <BuildDependency Project="wx_custom_build.vcxproj" />
+ </Project>
+ <Project Path="wx_wxscintilla.vcxproj" Id="74827ebd-93dc-5110-ba95-3f2ab029b6b0" />
+ <Project Path="wx_wxtiff.vcxproj" Id="75596ce6-5ae7-55c9-b890-c07b0a657a83" />
+ <Project Path="wx_wxwebp.vcxproj" Id="2d774e84-354b-415a-baf4-b13158808e6f" />
+ <Project Path="wx_wxzlib.vcxproj" Id="8b867186-a0b5-5479-b824-e176edd27c40" />
+ <Project Path="wx_xml.vcxproj" Id="3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6">
+ <BuildDependency Project="wx_base.vcxproj" />
+ </Project>
+ <Project Path="wx_xrc.vcxproj" Id="09f2f96a-1cc6-5e43-af1d-956ec2a4888d">
+ <BuildDependency Project="wx_core.vcxproj" />
+ <BuildDependency Project="wx_html.vcxproj" />
+ <BuildDependency Project="wx_xml.vcxproj" />
+ </Project>
+</Solution>


=====================================
docs/msw/install.md
=====================================
@@ -47,18 +47,24 @@ All makefiles and project are located in `build\msw` directory.
Microsoft Visual C++ Compilation {#msw_build_msvs}
----------------------------------------------------------------

+Note. All the instructions for building wxWidgets and using it in
+applications with Microsoft Visual Studio (MSVS) assume that Microsoft
+Visual C++ (MSVC) is being used as the C++ compiler (not Clang/LLVM).
+
### From the IDE

-Ready to use project files are provided for VC++ versions 2015, 2017, 2019 and 2022.
+Ready to use project files are provided for MSVS versions 2015, 2017, 2019,
+2022 and 2026.

-Simply open `wx_vcN.sln` (for N=14, 15, 16 or 17) file,
+Simply open `wx_vcN.sln` (for N=14, 15, 16 or 17 matching MSVS versions
+between 2015 and 2022) or `wx_vc18.slnx` (for MSVS 2026) file,
select the appropriate configuration (Debug or Release, static or DLL)
and build the solution. Notice that when building a DLL configuration,
you may need to perform the build several times because the projects
are not always built in the correct order, and this may result in link
errors. Simply do the build again, up to 3 times, to fix this.

-Note that targeting ARM64 requires VC++ 2017 or newer, while ARM64EC and ARM64X
+Note that targeting ARM64 requires MSVS 2017 or newer, while ARM64EC and ARM64X
require 2019 or newer and SDK 10.0.22621.0 or newer.

The custom build steps have not yet been tailored to support ARM64X, but it
@@ -72,19 +78,19 @@ seems to work well if you build with `Platform=ARM64` first and then
wxWidgets can also be built from the command line using the provided makefiles.

This needs to be done from the "Visual Studio Command Prompt" window, which can
-be opened using a shortcut installed to the "Start" menu or the "Start" screen
-by MSVS installation.
+be opened using a shortcut installed to the "Start" menu by MSVS installation.

-In this window, change directory to `%%WXWIN%\build\msw` and type
+In this window, change directory to `%%WXWIN%\build\msw` and type (use the
+solution matching your MSVS version, the example uses wx_vc17.sln for MSVS 2022)

> msbuild /m /p:Configuration=Debug /p:Platform=x64 wx_vc17.sln

-to build wxWidgets in the debug configuration as a static library using MSVS
-2022 (MSVC 17) toolset. Use "Release" configuration instead of "Debug" for the
-release version build and `wx_vc14.sln`, `wx_vc15.sln` or `wx_vc16.sln` for
-MSVS 2015, 2017 or 2019 respectively.
+to build wxWidgets in the debug configuration as a static library.
+Use `Release` configuration instead of `Debug` for the release version build.
+Similarly, use configurations `"DLL Debug"` and `"DLL Release"` for dynamic builds
+(the quotes around the configuration name are needed because it contains a space).

-After the build completes, open `%%WXWIN%\samples\samples_vc17.sln` solution
+After the build completes, open the appropriate sample solution in `%%WXWIN%\samples\`
and try building and running the minimal sample to verify that your build is
functional.

@@ -132,9 +138,9 @@ contributors. If the version is out of date, please [create an issue or pull req



-### Special notes for Visual Studio
+### Special notes for MSVS

-For Visual Studio solutions it is possible to customize the build by
+For MSVS solutions it is possible to customize the build by
creating a `wx_local.props` file in the `build\msw` directory which is used, if it
exists, by the projects. The settings in that file override the default values
for the properties such as wxCfg (corresponding to the CFG makefile variable
@@ -142,15 +148,15 @@ described below) or wxVendor (corresponding to VENDOR). The typical way to
make the file is to copy `wx_setup.props` to `wx_local.props` and then edit local.

For example, if you are building wxWidgets libraries using multiple versions
-of Visual Studio you could change wxCompilerPrefix to include the toolset:
+of MSVS you could change wxCompilerPrefix to include the toolset:

- <wxCompilerPrefix>vc</wxCompilerPrefix>
+ <wxCompilerPrefix>vc$(PlatformToolsetVersion)</wxCompilerPrefix>

-Following that example if you are using Visual Studio 2015 and open
+Following that example if you are using MSVS 2015 and open
`wx_vc14.sln` it will build using the "vc140" prefix for the build directories
so to allow its build files to coexist with the files produced by the other
-MSVC versions.
+MSVS versions.

Keep in mind that by using a separate local props file you ensure that your
changes won't be lost when updating to a future wxWidgets version. But if
@@ -159,12 +165,12 @@ updated with it. For example the version information in `wx_setup.props` could
change and the information in your `wx_local.props` would be outdated. It is
your responsibility to monitor for such situations.

-### Improve debugging for Visual Studio
+### Improve debugging for MSVS

Debug visualizers which make inspecting various wxWidgets classes easier to view
while debugging are provided in file `%%WXWIN%\misc\msvc\wxWidgets.natvis`.
The visualisers can be either added to a project or installed system-wide.
-See the [Visual Studio documentation](https://learn.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects)
+See the [MSVS documentation](https://learn.microsoft.com/en-us/visualstudio/debugger/create-custom-views-of-native-objects)
for more information.


@@ -347,11 +353,11 @@ The full list of the build settings follows:

* `RUNTIME_LIBS=static`

- (VC++ only.) Links static version of C and C++ runtime libraries into the
+ (MSVC only.) Links static version of the CRT into the
executable, so that the program does not depend on DLLs provided with the
compiler.

- Caution: Do not use static runtime libraries when building DLL (SHARED=1)!
+ Caution: Do not use the static CRT when building DLL (SHARED=1)!

* `DEBUG_FLAG=0`
* `DEBUG_FLAG=1`
@@ -377,18 +383,18 @@ The full list of the build settings follows:
* `DEBUG_RUNTIME_LIBS=0`
* `DEBUG_RUNTIME_LIBS=1`

- (VC++ only.) If set to 1, msvcrtd.dll is used, if to 0, msvcrt.dll
- is used. By default msvcrtd.dll is used only if the executable
- contains debug info and msvcrt.dll if it doesn't. It is sometimes
+ (MSVC only.) If set to 1, the debug CRT is used, if to 0, the release CRT
+ is used. By default the former is used only if the executable
+ contains debug info and the latter if it doesn't. It is sometimes
desirable to build with debug info and still link against msvcrt.dll
(e.g. when you want to ship the app to customers and still have
usable .pdb files with debug information) and this setting makes it
possible.

-* `TARGET_CPU=X64|ARM|ARM64|IA64`
+* `TARGET_CPU=X64|ARM|ARM64`

- (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
- build is performed.
+ (MSVC only.) Set this variable to build for the target architecture. If unset,
+ then the default architecture for the active Developer Command Prompt is used.

* `VENDOR=<your company name>`

@@ -396,9 +402,9 @@ The full list of the build settings follows:
distribute wxWidgets DLLs with your application. Default value is 'custom'.
This string is included as part of DLL name. wxWidgets DLLs contain compiler
name, version information and vendor name in them. For example
- `wxmsw311u_core_vc_custom.dll` is one of DLLs build using Visual C++ with
+ `wxmsw331u_core_vc_x64_custom.dll` is one of DLLs built using MSVC with
default settings. If you set VENDOR=mycorp, the name will change to
- `wxmsw311u_core_vc_mycorp.dll.`
+ `wxmsw331u_core_vc_x64_mycorp.dll.`

* `CFG=<configuration name>`

@@ -435,7 +441,7 @@ Building Applications Using wxWidgets {#msw_build_apps}
Note: If you want to use CMake for building your project, please see
@ref overview_cmake.

-Using Microsoft Visual C++ IDE {#msw_build_apps_msvc}
+Using MSVS {#msw_build_apps_msvc}
------------------------------

If you use MSVS for building your project, simply add
@@ -454,7 +460,7 @@ Using Other Compilers or Command Line {#msw_build_apps_other}

We suppose that wxWidgets sources are under the directory `$WXWIN` (notice that
different tool chains refer to environment variables such as WXWIN in
-different ways, e.g. MSVC users should use `$``(WXWIN)` instead of just
+different ways, e.g. MSVS users should use `$``(WXWIN)` instead of just
`$WXWIN`). And we will use `<wx-lib-dir>` as a shortcut for the subdirectory of
`$WXWIN\lib` which is composed from several parts separated by underscore:
first, a compiler-specific prefix (e.g. "vc" for MSVC, "gcc" for g++ or the


=====================================
include/wx/rtti.h
=====================================
@@ -226,6 +226,25 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
wxObject* name::wxCreateObject() \
{ return new name; }

+ // Template specialization with one base class.
+#define wxIMPLEMENT_DYNAMIC_TEMPLATE_SPECIALIZATION(name, arg, basename) \
+ template <> \
+ wxObject* name<arg>::wxCreateObject() { return new name<arg>; } \
+ template <> \
+ wxClassInfo \
+ name<arg>::ms_classInfo \
+ ( \
+ wxT(#name) L"<" wxT(#arg) L">", \
+ &basename::ms_classInfo, \
+ nullptr, \
+ static_cast<int>(sizeof(name<arg>)), \
+ name<arg>::wxCreateObject \
+ ); \
+ template <> \
+ wxClassInfo* name<arg>::GetClassInfo() const { return &ms_classInfo; }
+
+
+
// -----------------------------------
// for abstract classes
// -----------------------------------


=====================================
interface/wx/object.h
=====================================
@@ -797,6 +797,36 @@ public:
*/
#define wxIMPLEMENT_DYNAMIC_CLASS2( className, baseClassName1, baseClassName2 )

+/**
+ Used in a C++ implementation file to complete the declaration of a class
+ that has run-time type information, and whose instances can be created
+ dynamically. Use this for template specializations.
+
+ Please note that @a arg must be the template parameter the primary template
+ @a templateName is being specialized for, e.g.
+
+ @code
+ template <typename T>
+ class MyWindow : public wxWindow
+ {
+ public:
+ MyWindow() = default; // Must have a default ctor for dynamic creation.
+
+ private:
+ T m_value;
+
+ wxDECLARE_DYNAMIC_CLASS(MyWindow);
+ };
+
+ wxIMPLEMENT_DYNAMIC_TEMPLATE_SPECIALIZATION(MyWindow, int, wxWindow);
+ @endcode
+
+ @header{wx/object.h}
+
+ @since 3.3.2
+*/
+#define wxIMPLEMENT_DYNAMIC_TEMPLATE_SPECIALIZATION( templateName, arg, baseClassName )
+
/**
Synonym for wxIMPLEMENT_ABSTRACT_CLASS().



=====================================
interface/wx/settings.h
=====================================
@@ -109,7 +109,10 @@ enum wxSystemColour
wxSYS_COLOUR_LISTBOXTEXT,

/**
- Text colour for the unfocused selection of list-like controls.
+ Text colour for the selected items in list-like controls.
+
+ This colour is supposed to have good contrast with the background drawn
+ by wxRendererNative::DrawItemSelectionRect().

@since 2.9.1
*/


=====================================
samples/samples_vc18.slnx
=====================================
@@ -0,0 +1,1373 @@
+<Solution>
+ <Configurations>
+ <BuildType Name="Debug" />
+ <BuildType Name="DLL Debug" />
+ <BuildType Name="DLL Release" />
+ <BuildType Name="Release" />
+ <Platform Name="Win32" />
+ <Platform Name="x64" />
+ </Configurations>
+ <Folder Name="/1 Fundamental Samples/">
+ <Project Path="dialogs/dialogs.vcxproj" Id="b80d5c13-0d78-4038-b1b4-5ea80436fb98">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="minimal/minimal.vcxproj" Id="853d1fd7-20ab-586c-9699-9680f84ac985">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="widgets/widgets.vcxproj" Id="ebeb60a6-51e1-453c-a147-e9e2284d073f">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <Deploy Solution="Debug|Win32" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/" />
+ <Folder Name="/2 GUI Controls Samples/2.1 Menus, Toolbars and Co/">
+ <Project Path="menu/menu.vcxproj" Id="3c538c2f-ae17-41f5-b075-3ccf5a2da09e">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <Deploy Solution="Debug|Win32" />
+ </Project>
+ <Project Path="ribbon/ribbon.vcxproj" Id="ce81f05e-b44c-442f-bfa1-13176ba3f598">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_ribbon.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="statbar/statbar.vcxproj" Id="fd3a24e0-a85d-41eb-8e7e-45b01494fb82">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="toolbar/toolbar.vcxproj" Id="7e93311e-590f-480e-8086-5eefeb2ce579">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <Deploy Solution="Debug|Win32" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.2 Grids, Lists and Trees/">
+ <Project Path="dataview/dataview.vcxproj" Id="7f86e6b2-691a-4197-a6ce-45af15b9301b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="grid/grid.vcxproj" Id="4fe6adbb-284f-4e4c-a933-60994138d897">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="htlbox/htlbox.vcxproj" Id="f73e57df-47c3-495f-a91c-37ebab6e9c6c">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="listctrl/listctrl.vcxproj" Id="154bd428-5006-4231-8e79-4a281dd886ae">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="propgrid/propgrid.vcxproj" Id="f758a9a8-2db1-4aee-beb9-9f92b7fb5c1e">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_propgrid.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xml.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xrc.vcxproj" />
+ </Project>
+ <Project Path="treectrl/treectrl.vcxproj" Id="575c6e06-0ab9-48c4-aa39-7c4771f018c0">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="treelist/treelist.vcxproj" Id="94a90ce6-dfcb-49b5-a704-175978df0a31">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.3 Text/">
+ <Project Path="combo/combo.vcxproj" Id="eb38caf1-ae8c-4085-8541-f2ae28c74168">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="richtext/richtext.vcxproj" Id="2131c9d5-5d6f-4298-8edb-dfad75647e4b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_richtext.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xml.vcxproj" />
+ </Project>
+ <Project Path="stc/stc.vcxproj" Id="c6b835d0-b5ab-4c9d-9425-b3be2c4bc702">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_stc.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxlexilla.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxscintilla.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="text/text.vcxproj" Id="73843f2b-ef6f-4902-afc7-277c8cf040df">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.4 Containers/">
+ <Project Path="aui/auidemo.vcxproj" Id="56be5e5a-6cbd-4dd3-930e-b11b8c23a967">
+ <BuildDependency Project="../build/msw/wx_aui.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xml.vcxproj" />
+ </Project>
+ <Project Path="collpane/collpane.vcxproj" Id="55699e53-ebe2-4dce-be3a-9b3babf8e1de">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="notebook/notebook.vcxproj" Id="fa7f88d2-16cb-4ffe-86e8-63fb4bbf30fb">
+ <BuildDependency Project="../build/msw/wx_aui.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.5 Document-oriented/">
+ <Project Path="docview/docview.vcxproj" Id="cfbd4beb-2f03-410a-be37-f81d375682d3">
+ <BuildDependency Project="../build/msw/wx_aui.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="mdi/mdi.vcxproj" Id="ea75bd1d-c240-4475-9509-c816c1e5a637">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="printing/printing.vcxproj" Id="568be9e5-4517-4cb6-9ef9-b4b140c50fe2">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.6 Layout/">
+ <Project Path="layout/layout.vcxproj" Id="4c4b2d50-95bf-4711-bdc3-e1a36f442e0d">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="splitter/splitter.vcxproj" Id="3c475b4e-2814-b659-512d-a4013d59ebe7">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="wrapsizer/wrapsizer.vcxproj" Id="1c00fc4c-29f5-440e-b6ee-0588985276f4">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.7 HTML/">
+ <Project Path="html/about/about.vcxproj" Id="d2a06e44-999a-4556-b6c6-752a3e9256f0">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/help/help.vcxproj" Id="014917fd-7e8d-4516-a27c-9dd1e47c89d4">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/helpview/helpview.vcxproj" Id="3e09a72d-c93f-40b7-8aba-cc048511f59c">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/printing/printing.vcxproj" Id="93561ca0-5304-42ff-9e91-1c8a62480cc3">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/test/test.vcxproj" Id="d12847c7-a187-45f4-99e5-6db393d6cae1">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/virtual/virtual.vcxproj" Id="f21160b5-e21c-40f8-951a-720eee4b1cad">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/widget/widget.vcxproj" Id="ee61b8af-1f39-4f56-b5ac-3cb3a27b8de7">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="html/zip/zip.vcxproj" Id="acd14e94-b761-487c-836c-bb93c6fd61fb">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/2 GUI Controls Samples/2.8 Miscellaneous/">
+ <Project Path="animate/anitest.vcxproj" Id="d490b62d-4335-4f7f-aaf6-50379254b0e0">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="calendar/calendar.vcxproj" Id="7ad45428-cecb-43b8-ba03-dde9be7ba159">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="mediaplayer/mediaplayer.vcxproj" Id="d92325c1-5348-448a-9dc0-b1a1c3f1d3b2">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_media.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="popup/popup.vcxproj" Id="4aa2fcb2-0b84-42c8-96d8-fcff8c16efeb">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="webview/webview.vcxproj" Id="7688215b-1082-5681-9d37-e950d6210117">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_stc.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_webview.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxlexilla.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxscintilla.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/3 Other GUI Samples/" />
+ <Folder Name="/3 Other GUI Samples/3.1 Input/">
+ <Project Path="caret/caret.vcxproj" Id="7d8b6eae-70de-46fb-9c4c-13ee0e02990e">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="joytest/joytest.vcxproj" Id="3e9c19ee-51ec-4df3-bf3c-7535080be390">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="keyboard/keyboard.vcxproj" Id="443b91d2-e8a9-4fe5-8be3-39cf43ff5195">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="touchtest/touchtest.vcxproj" Id="2c187c8d-a452-4730-9eb0-da6f2b65a1c6">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/3 Other GUI Samples/3.2 Graphics/">
+ <Project Path="drawing/drawing.vcxproj" Id="55d77c30-8a78-4d49-a75d-a7be70d92175">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <Deploy Solution="Debug|Win32" />
+ </Project>
+ <Project Path="erase/erase.vcxproj" Id="38b9760a-0448-46c2-b47f-54a18a882353">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="image/image.vcxproj" Id="187376a2-da63-40a2-81a7-21dd74583953">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="ownerdrw/ownerdrw.vcxproj" Id="126633a2-2e49-4a7b-a375-90b2623da824">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="render/render.vcxproj" Id="c6eac135-fdc8-4175-b79c-9b2a6da012ce">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="scroll/scroll.vcxproj" Id="dc6d94d4-e56d-4088-ad2a-d46d63aa884c">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="svg/svgtest.vcxproj" Id="2de887ac-afc9-4b90-bab8-2a1fe8e8ab51">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="vscroll/vscroll.vcxproj" Id="4d601df4-3cf4-42a0-9242-88a5162a114b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/3 Other GUI Samples/3.2 Graphics/OpenGL/">
+ <Project Path="opengl/cube/cube.vcxproj" Id="f7887b23-6b61-4cf6-b6bc-ec76500ece31">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_gl.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="opengl/isosurf/isosurf.vcxproj" Id="74df02eb-3828-4b8d-aefc-8939c3aaf3f3">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_gl.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="opengl/penguin/penguin.vcxproj" Id="ecf3415f-a6b1-4f8c-99e1-ff11413f136e">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_gl.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="opengl/pyramid/pyramid.vcxproj" Id="3a1c1e80-9897-41f4-96a3-46c5938cbea5">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_gl.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/3 Other GUI Samples/3.3 Miscellaneous/">
+ <Project Path="access/access.vcxproj" Id="5ea49c7d-8e25-4285-a9db-a37cc3da0794">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="artprov/artprov.vcxproj" Id="0d08f3c2-0466-4a78-a8c6-047b13c38f38">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <Deploy Solution="Debug|Win32" />
+ </Project>
+ <Project Path="debugrpt/debugrpt.vcxproj" Id="d86ea627-b6bf-4e6d-8e19-44c2aa01dc4b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_qa.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xml.vcxproj" />
+ </Project>
+ <Project Path="display/display.vcxproj" Id="3e314fdd-be00-4dc2-83b2-eb3cab3960d3">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="dnd/dnd.vcxproj" Id="0938e26d-0232-401c-88c4-cac8af2dfbbd">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="event/event.vcxproj" Id="77f14ba7-0efe-4657-b144-8d8942467056">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="except/except.vcxproj" Id="bb7c563c-d058-4715-bc98-f62b0ef1541d">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="font/font.vcxproj" Id="8149dc70-0067-4f7e-87bc-ca7fa9b52d57">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="help/help.vcxproj" Id="577ff6a3-390a-43c3-9b46-9e87803b954a">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="internat/internat.vcxproj" Id="b45248b1-bff5-40b2-a6a7-1bf46a5df077">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="preferences/preferences.vcxproj" Id="3d9272ca-549d-4680-9d92-e1c919be1927">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="shaped/shaped.vcxproj" Id="712398de-a11c-47d4-b5d8-0f144aae794b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="taborder/taborder.vcxproj" Id="1d8f6f7b-8af6-4f79-bfc6-61f63b134fe4">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="taskbar/taskbar.vcxproj" Id="4e686d24-7439-4d6d-87a3-7339a0d5d517">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="taskbarbutton/taskbarbutton.vcxproj" Id="5c13030d-d5e7-4d7e-aad1-fc09c3367305">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="uiaction/uiaction.vcxproj" Id="1a23ed47-a0e8-48eb-8f2f-67a9fbee666e">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="validate/validate.vcxproj" Id="08ad02ad-82a7-4055-8135-b56d5696b905">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="wizard/wizard.vcxproj" Id="8851a820-0f61-45d6-a3ab-e3f8aceba28e">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="xrc/xrcdemo.vcxproj" Id="b558b15a-f097-42e7-9a18-f81d090c3e62">
+ <BuildDependency Project="../build/msw/wx_aui.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_html.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_ribbon.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xml.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_xrc.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/4 Other Samples/" />
+ <Folder Name="/4 Other Samples/4.1 Communication and Network/">
+ <Project Path="webrequest/webrequest.vcxproj" Id="57c8d311-46f1-47d5-a8cc-2c21d1b55c20">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/4 Other Samples/4.1 Communication and Network/IPC/">
+ <Project Path="ipc/baseipcclient.vcxproj" Id="27db83aa-267d-49bc-867f-720a4a303da6">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="ipc/baseipcserver.vcxproj" Id="8280d641-3b31-49fe-a369-5af2e94ff71c">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="ipc/ipcclient.vcxproj" Id="a57c693a-e223-4de0-9720-f286934c55d4">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="ipc/ipcserver.vcxproj" Id="a8019f6c-4036-45a4-9a02-724a75c0e292">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/4 Other Samples/4.1 Communication and Network/Sockets/">
+ <Project Path="sockets/baseclient.vcxproj" Id="f6ab1942-f1ed-4320-8020-ba4e9d58ebb5">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="sockets/baseserver.vcxproj" Id="a8ed9b31-a29c-4bbb-9732-51b38b7bf28c">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="sockets/client.vcxproj" Id="2c001418-6d75-4370-9102-f7b891537371">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="sockets/server.vcxproj" Id="3feaa19a-7834-459b-bc50-96f3907d1ba6">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_net.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/4 Other Samples/4.2 Miscellaneous/">
+ <Project Path="archive/archive.vcxproj" Id="26701e8f-872d-4899-849f-1f6e2f0f7560">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="config/config.vcxproj" Id="b8fc7dcc-abf8-4850-b2c4-4f74eb172d20">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="console/console.vcxproj" Id="47ce4ef9-6cad-4e1f-81c4-66f45ba05b7f">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="exec/exec.vcxproj" Id="c3c02679-f6b4-4bc3-ac0b-491a27ebbd3f">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="fswatcher/fswatcher.vcxproj" Id="2e28cade-b1c6-49c5-b99d-11f3cdb85bc8">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="power/power.vcxproj" Id="13bf61ef-9284-4b9b-bf04-07bb8ef4a7b2">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="secretstore/secretstore.vcxproj" Id="849e3954-da52-43e9-b6e5-a7c20557931a">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="sound/sound.vcxproj" Id="e38428dd-280e-4e23-b37f-c1172d4f6db0">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/5 Windows-specific Samples/">
+ <Project Path="mfc/mfc.vcxproj" Id="bbf7b6cf-635e-437f-b409-5ff6ffeb622b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="nativdlg/nativdlg.vcxproj" Id="bba9c805-69e8-4496-b389-80cfe78b06c6">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="oleauto/oleauto.vcxproj" Id="396175fb-afb7-422f-bd24-c883bd2183e2">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="regtest/regtest.vcxproj" Id="7b2a839e-4bdd-441b-a478-7a6cc9f76cc2">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/5 Windows-specific Samples/DLL/">
+ <Project Path="dll/my_dll.vcxproj" Id="cb5cda61-4ec1-4f27-a2b2-4d864c299e4c">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="dll/sdk_exe.vcxproj" Id="f2c2c08c-4b84-4215-8730-3897549005b5">
+ <BuildDependency Project="dll/my_dll.vcxproj" />
+ <BuildType Solution="DLL Debug|Win32" Project="Debug" />
+ <BuildType Solution="DLL Release|Win32" Project="Release" />
+ </Project>
+ <Project Path="dll/wx_exe.vcxproj" Id="5a3cead4-69b4-47bb-a058-c5f539f6f3a3">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ <BuildDependency Project="dll/my_dll.vcxproj" />
+ <Build Solution="DLL Debug|*" Project="false" />
+ <Build Solution="DLL Release|*" Project="false" />
+ </Project>
+ </Folder>
+ <Folder Name="/6 Unmaintained Old Samples/">
+ <Project Path="dialup/dialup.vcxproj" Id="44f86825-fc39-4393-ac7b-7da877163368">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="dragimag/dragimag.vcxproj" Id="cc5c76a6-07a8-4391-9543-7cf2f56f7e55">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="sashtest/sashtest.vcxproj" Id="f23d6859-e003-45b0-9cc5-5647c767841b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="splash/splash.vcxproj" Id="c9cb7521-dfb9-41b4-9823-af11907f845b">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_media.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="thread/thread.vcxproj" Id="34e00731-1380-49d6-8993-f89d99a47400">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="typetest/typetest.vcxproj" Id="28b9d892-99b7-41d1-a99b-039752f2c630">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ </Folder>
+ <Folder Name="/7 wxWidgets Libraries/">
+ <Project Path="../build/msw/wx_aui.vcxproj" Id="a16d3832-0f42-57ce-8f48-50e06649ade8">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_base.vcxproj" Id="3fcc50c2-81e9-5db2-b8d8-2129427568b1">
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxexpat.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxregex.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxzlib.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_core.vcxproj" Id="6744dad8-9c70-574a-bff2-9f8dddb24a75">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxjpeg.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxpng.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxtiff.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxwebp.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_custom_build.vcxproj" Id="01f4ce10-2cfb-41a8-b41f-e54337868a1d" />
+ <Project Path="../build/msw/wx_gl.vcxproj" Id="da8b15ef-6750-5928-bc0e-c748213cf9b2">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_html.vcxproj" Id="33cc42f9-7756-5587-863c-8d4461b7c5dd">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_media.vcxproj" Id="8bd8f8d9-4275-5b42-a8f4-f1db2970a550">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_net.vcxproj" Id="69f2ede4-7d21-5738-9bc0-f66f61c9ae00">
+ <BuildDependency Project="../build/msw/wx_base.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_propgrid.vcxproj" Id="97fdab45-9c58-5bc5-a2f4-ee42739ebc63">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_qa.vcxproj" Id="e21129e0-7c08-5936-9d8c-0d60b5319ba7">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_ribbon.vcxproj" Id="87b42a9c-3f5c-53d7-9017-2b1cae39457d">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_richtext.vcxproj" Id="7fb0902d-8579-5dce-b883-daf66a885005">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_stc.vcxproj" Id="23e1c437-a951-5943-8639-a17f3cf2e606">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxlexilla.vcxproj" />
+ <BuildDependency Project="../build/msw/wx_wxscintilla.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_webview.vcxproj" Id="a8e8442a-078a-5fc5-b495-8d71ba77ee6e">
+ <BuildDependency Project="../build/msw/wx_core.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_wxexpat.vcxproj" Id="a1a8355b-0988-528e-9cc2-b971d6266669" />
+ <Project Path="../build/msw/wx_wxjpeg.vcxproj" Id="6053cc38-cdee-584c-8bc8-4b000d800fc7" />
+ <Project Path="../build/msw/wx_wxlexilla.vcxproj" Id="812eddee-840f-4807-a732-8a0b81409f39" />
+ <Project Path="../build/msw/wx_wxpng.vcxproj" Id="8acc122a-ca6a-5aa6-9c97-9cdd2e533db0" />
+ <Project Path="../build/msw/wx_wxregex.vcxproj" Id="56a4b526-bb81-5d01-aaa9-16d23bbb169d">
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_wxscintilla.vcxproj" Id="74827ebd-93dc-5110-ba95-3f2ab029b6b0" />
+ <Project Path="../build/msw/wx_wxtiff.vcxproj" Id="75596ce6-5ae7-55c9-b890-c07b0a657a83" />
+ <Project Path="../build/msw/wx_wxwebp.vcxproj" Id="2d774e84-354b-415a-baf4-b13158808e6f" />
+ <Project Path="../build/msw/wx_wxzlib.vcxproj" Id="8b867186-a0b5-5479-b824-e176edd27c40" />
+ <Project Path="../build/msw/wx_xml.vcxproj" Id="3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6">
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ </Project>
+ <Project Path="../build/msw/wx_xrc.vcxproj" Id="09f2f96a-1cc6-5e43-af1d-956ec2a4888d">
+ <BuildDependency Project="../build/msw/wx_custom_build.vcxproj" />
+ </Project>
+ </Folder>
+</Solution>


=====================================
samples/treectrl/treetest.cpp
=====================================
@@ -89,6 +89,9 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
MENU_LINK(TogFullHighlight)
MENU_LINK(SetFgColour)
MENU_LINK(SetBgColour)
+#if wxUSE_ALT_GENERIC_TREECTRL
+ MENU_LINK(UseGeneric)
+#endif // wxUSE_ALT_GENERIC_TREECTRL
MENU_LINK(ResetStyle)

MENU_LINK(Highlight)
@@ -150,45 +153,6 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)

wxEND_EVENT_TABLE()

-#if USE_GENERIC_TREECTRL
-wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxGenericTreeCtrl)
-#else
-wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
-#endif
- EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag)
- EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag)
- EVT_TREE_END_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnEndDrag)
- EVT_TREE_BEGIN_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnBeginLabelEdit)
- EVT_TREE_END_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnEndLabelEdit)
- EVT_TREE_DELETE_ITEM(TreeTest_Ctrl, MyTreeCtrl::OnDeleteItem)
-#if 0 // there are so many of those that logging them causes flicker
- EVT_TREE_GET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnGetInfo)
-#endif
- EVT_TREE_SET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnSetInfo)
- EVT_TREE_ITEM_EXPANDED(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanded)
- EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding)
- EVT_TREE_ITEM_COLLAPSED(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsed)
- EVT_TREE_ITEM_COLLAPSING(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsing)
-
- EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged)
- EVT_TREE_SEL_CHANGING(TreeTest_Ctrl, MyTreeCtrl::OnSelChanging)
- EVT_TREE_KEY_DOWN(TreeTest_Ctrl, MyTreeCtrl::OnTreeKeyDown)
- EVT_TREE_ITEM_ACTIVATED(TreeTest_Ctrl, MyTreeCtrl::OnItemActivated)
- EVT_TREE_STATE_IMAGE_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemStateClick)
-
- // so many different ways to handle right mouse button clicks...
- EVT_CONTEXT_MENU(MyTreeCtrl::OnContextMenu)
- // EVT_TREE_ITEM_MENU is the preferred event for creating context menus
- // on a tree control, because it includes the point of the click or item,
- // meaning that no additional placement calculations are required.
- EVT_TREE_ITEM_MENU(TreeTest_Ctrl, MyTreeCtrl::OnItemMenu)
- EVT_TREE_ITEM_RIGHT_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemRClick)
-
- EVT_RIGHT_DOWN(MyTreeCtrl::OnRMouseDown)
- EVT_RIGHT_UP(MyTreeCtrl::OnRMouseUp)
- EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick)
-wxEND_EVENT_TABLE()
-
wxIMPLEMENT_APP(MyApp);

bool MyApp::OnInit()
@@ -213,11 +177,7 @@ bool MyApp::OnInit()
// My frame constructor
MyFrame::MyFrame()
: wxFrame(nullptr, wxID_ANY, "wxTreeCtrl test",
- wxDefaultPosition, FromDIP(wxSize(450, 600), nullptr)),
- m_treeCtrl(nullptr)
-#if wxUSE_LOG
- , m_textCtrl(nullptr)
-#endif // wxUSE_LOG
+ wxDefaultPosition, FromDIP(wxSize(450, 600), nullptr))
{
// This reduces flicker effects - even better would be to define
// OnEraseBackground to do nothing. When the tree control's scrollbars are
@@ -264,6 +224,10 @@ MyFrame::MyFrame()
style_menu->AppendSeparator();
style_menu->Append(TreeTest_SetFgColour, "Set &foreground colour...");
style_menu->Append(TreeTest_SetBgColour, "Set &background colour...");
+#if wxUSE_ALT_GENERIC_TREECTRL
+ style_menu->AppendSeparator();
+ style_menu->AppendCheckItem(TreeTest_UseGeneric, "Use &generic tree control\tCtrl-G");
+#endif // wxUSE_ALT_GENERIC_TREECTRL
style_menu->AppendSeparator();
style_menu->Append(TreeTest_ResetStyle, "&Reset to default\tF10");

@@ -398,9 +362,26 @@ void MyFrame::CreateTreeWithDefStyle()

void MyFrame::CreateTree(long style)
{
- m_treeCtrl = new MyTreeCtrl(m_panel, TreeTest_Ctrl,
- wxDefaultPosition, wxDefaultSize,
- style);
+#if wxUSE_ALT_GENERIC_TREECTRL
+ if ( GetMenuBar()->IsChecked(TreeTest_UseGeneric) )
+ {
+ auto* const tree = new MyTreeCtrl<wxGenericTreeCtrl>;
+ tree->Create(m_panel, TreeTest_Ctrl,
+ wxDefaultPosition, wxDefaultSize,
+ style);
+ m_treeCtrlIface = tree;
+ m_treeCtrl = tree;
+ }
+ else
+#endif // wxUSE_ALT_GENERIC_TREECTRL
+ {
+ auto* const tree = new MyTreeCtrl<wxTreeCtrl>;
+ tree->Create(m_panel, TreeTest_Ctrl,
+ wxDefaultPosition, wxDefaultSize,
+ style);
+ m_treeCtrlIface = tree;
+ m_treeCtrl = tree;
+ }

GetMenuBar()->Enable(TreeTest_SelectRoot, !(style & wxTR_HIDE_ROOT));

@@ -432,7 +413,7 @@ void MyFrame::OnIdle(wxIdleEvent& event)
wxString status;
if (idRoot.IsOk())
{
- wxTreeItemId idLast = m_treeCtrl->GetLastTreeITem();
+ wxTreeItemId idLast = m_treeCtrlIface->GetLastTreeITem();
status = wxString::Format(
"Root/last item is %svisible/%svisible",
m_treeCtrl->IsVisible(idRoot) ? "" : "not ",
@@ -541,7 +522,7 @@ void MyFrame::DoSort(bool reverse)

CHECK_ITEM( item );

- m_treeCtrl->DoSortChildren(item, reverse);
+ m_treeCtrlIface->DoSortChildren(item, reverse);
}

void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event))
@@ -570,7 +551,7 @@ void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))

CHECK_ITEM( root );

- m_treeCtrl->GetItemsRecursively(root);
+ m_treeCtrlIface->GetItemsRecursively(root);
}

#ifndef NO_MULTIPLE_SELECTION
@@ -678,7 +659,7 @@ void MyFrame::OnFreezeThaw(wxCommandEvent& event)
void MyFrame::OnRecreate(wxCommandEvent& event)
{
OnDeleteAll(event);
- m_treeCtrl->AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS);
+ m_treeCtrlIface->AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS);
}

void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event))
@@ -686,11 +667,11 @@ void MyFrame::OnSetImageSize(wxCommandEvent& WXUNUSED(event))
int size = wxGetNumberFromUser("Enter the size for the images to use",
"Size: ",
"TreeCtrl sample",
- m_treeCtrl->ImageSize());
+ m_treeCtrlIface->ImageSize());
if ( size == -1 )
return;

- m_treeCtrl->CreateImages(size);
+ m_treeCtrlIface->CreateImages(size);
wxGetApp().SetShowImages(true);
}

@@ -698,12 +679,12 @@ void MyFrame::OnToggleImages(wxCommandEvent& WXUNUSED(event))
{
if ( wxGetApp().ShowImages() )
{
- m_treeCtrl->CreateImages(-1);
+ m_treeCtrlIface->CreateImages(-1);
wxGetApp().SetShowImages(false);
}
else
{
- m_treeCtrl->CreateImages(0);
+ m_treeCtrlIface->CreateImages(0);
wxGetApp().SetShowImages(true);
}
}
@@ -717,7 +698,7 @@ void MyFrame::OnToggleStates(wxCommandEvent& WXUNUSED(event))
}
else
{
- m_treeCtrl->CreateStateImages();
+ m_treeCtrlIface->CreateStateImages();
wxGetApp().SetShowStates(true);
}
}
@@ -729,41 +710,69 @@ void MyFrame::OnToggleBell(wxCommandEvent& event)

void MyFrame::OnToggleAlternateImages(wxCommandEvent& WXUNUSED(event))
{
- bool alternateImages = m_treeCtrl->AlternateImages();
+ bool alternateImages = m_treeCtrlIface->AlternateImages();

- m_treeCtrl->SetAlternateImages(!alternateImages);
- m_treeCtrl->CreateImages(0);
+ m_treeCtrlIface->SetAlternateImages(!alternateImages);
+ m_treeCtrlIface->CreateImages(0);
}

void MyFrame::OnToggleAlternateStates(wxCommandEvent& WXUNUSED(event))
{
- bool alternateStates = m_treeCtrl->AlternateStates();
+ bool alternateStates = m_treeCtrlIface->AlternateStates();

- m_treeCtrl->SetAlternateStates(!alternateStates);
- m_treeCtrl->CreateStateImages();
+ m_treeCtrlIface->SetAlternateStates(!alternateStates);
+ m_treeCtrlIface->CreateStateImages();

// normal states < alternate states
// so we must reset broken states
if ( alternateStates )
- m_treeCtrl->ResetBrokenStateImages();
+ m_treeCtrlIface->ResetBrokenStateImages();
}

void MyFrame::OnToggleButtons(wxCommandEvent& WXUNUSED(event))
{
-#ifdef HAS_GENERIC_TREECTRL
+#if wxUSE_ALT_GENERIC_TREECTRL
+ if ( !GetMenuBar()->IsChecked(TreeTest_UseGeneric) )
+ {
+ wxLogError("Toggling buttons is currently only supported "
+ "by the generic tree control.");
+ return;
+ }
+#endif // wxUSE_ALT_GENERIC_TREECTRL
+
+ auto* const treeCtrlGeneric = wxStaticCast(m_treeCtrl, wxGenericTreeCtrl);
+
if ( wxGetApp().ShowButtons() )
{
- m_treeCtrl->CreateButtonsImageList(-1);
+ m_treeCtrlIface->CreateButtonsImageList(treeCtrlGeneric, -1);
wxGetApp().SetShowButtons(false);
}
else
{
- m_treeCtrl->CreateButtonsImageList(15);
+ m_treeCtrlIface->CreateButtonsImageList(treeCtrlGeneric, 15);
wxGetApp().SetShowButtons(true);
}
-#endif
}

+#if wxUSE_ALT_GENERIC_TREECTRL
+
+void MyFrame::OnUseGeneric(wxCommandEvent& WXUNUSED(event))
+{
+ // Get current style before destroying the tree
+ const long style = m_treeCtrl->GetWindowStyle();
+
+ // Destroy the old tree control
+ delete m_treeCtrl;
+ m_treeCtrlIface = nullptr;
+ m_treeCtrl = nullptr;
+
+ // Create tree control of different type (as check menu item state has been
+ // toggled) with the same style
+ CreateTree(style);
+}
+
+#endif // wxUSE_ALT_GENERIC_TREECTRL
+
void MyFrame::OnCollapseAndReset(wxCommandEvent& WXUNUSED(event))
{
m_treeCtrl->CollapseAndReset(m_treeCtrl->GetRootItem());
@@ -772,7 +781,7 @@ void MyFrame::OnCollapseAndReset(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnEnsureVisible(wxCommandEvent& WXUNUSED(event))
{
const wxTreeItemId
- idLast = m_treeCtrl->GetLastTreeITem();
+ idLast = m_treeCtrlIface->GetLastTreeITem();
if ( idLast.IsOk() )
m_treeCtrl->EnsureVisible(idLast);
else
@@ -786,7 +795,7 @@ void MyFrame::OnSetFocus(wxCommandEvent& WXUNUSED(event))

void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event))
{
- int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1;
+ int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1;
m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item");
}

@@ -799,7 +808,7 @@ void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event))

m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(),
text /*,
- MyTreeCtrl::TreeCtrlIcon_File */ );
+ TreeCtrlIcon_File */ );
}

void MyFrame::OnAddManyItems(wxCommandEvent& WXUNUSED(event))
@@ -853,7 +862,7 @@ void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))

CHECK_ITEM( item );

- m_treeCtrl->DoToggleIcon(item);
+ m_treeCtrlIface->DoToggleIcon(item);
}

void MyFrame::OnToggleState(wxCommandEvent& WXUNUSED(event))
@@ -862,7 +871,7 @@ void MyFrame::OnToggleState(wxCommandEvent& WXUNUSED(event))

CHECK_ITEM( item );

- m_treeCtrl->DoToggleState(item);
+ m_treeCtrlIface->DoToggleState(item);
}

void MyFrame::DoShowFirstOrLast(TreeFunc0_t pfn, const wxString& label)
@@ -886,8 +895,8 @@ void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label)

CHECK_ITEM( item );

- if ((pfn == (TreeFunc1_t) &wxTreeCtrl::GetPrevVisible
- || pfn == (TreeFunc1_t) &wxTreeCtrl::GetNextVisible)
+ if ((pfn == (TreeFunc1_t) &wxTreeCtrlBase::GetPrevVisible
+ || pfn == (TreeFunc1_t) &wxTreeCtrlBase::GetNextVisible)
&& !m_treeCtrl->IsVisible(item))
{
wxLogMessage("The selected item must be visible.");
@@ -920,7 +929,7 @@ void MyFrame::OnScrollTo(wxCommandEvent& WXUNUSED(event))

void MyFrame::OnSelectLast(wxCommandEvent& WXUNUSED(event))
{
- wxTreeItemId item = m_treeCtrl->GetLastTreeITem();
+ wxTreeItemId item = m_treeCtrlIface->GetLastTreeITem();

CHECK_ITEM( item );

@@ -942,26 +951,69 @@ void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event))
}

// MyTreeCtrl implementation
-#if USE_GENERIC_TREECTRL
-wxIMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxGenericTreeCtrl);
-#else
-wxIMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl);
-#endif
-
-MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style)
- : wxTreeCtrl(parent, id, pos, size, style),
- m_alternateImages(false),
- m_alternateStates(false)
-{
- m_reverseSort = false;
+#if wxUSE_ALT_GENERIC_TREECTRL
+wxIMPLEMENT_DYNAMIC_TEMPLATE_SPECIALIZATION(MyTreeCtrl, wxGenericTreeCtrl, wxGenericTreeCtrl);
+#endif // wxUSE_ALT_GENERIC_TREECTRL
+wxIMPLEMENT_DYNAMIC_TEMPLATE_SPECIALIZATION(MyTreeCtrl, wxTreeCtrl, wxTreeCtrl);
+
+template <class TreeCtrlBase>
+bool
+MyTreeCtrl<TreeCtrlBase>::Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ long style)
+{
+ if ( !TreeCtrlBase::Create(parent, id, pos, size, style) )
+ return false;

CreateImages(16);
CreateStateImages();

// Add some items to the tree
AddTestItemsToTree(NUM_CHILDREN_PER_LEVEL, NUM_LEVELS);
+
+ // Bind the event handlers.
+ this->Bind(wxEVT_TREE_BEGIN_DRAG, &MyTreeCtrl::OnBeginDrag, this);
+ this->Bind(wxEVT_TREE_BEGIN_DRAG, &MyTreeCtrl::OnBeginRDrag, this);
+ this->Bind(wxEVT_TREE_END_DRAG, &MyTreeCtrl::OnEndDrag, this);
+ this->Bind(wxEVT_TREE_BEGIN_LABEL_EDIT, &MyTreeCtrl::OnBeginLabelEdit, this);
+ this->Bind(wxEVT_TREE_END_LABEL_EDIT, &MyTreeCtrl::OnEndLabelEdit, this);
+ this->Bind(wxEVT_TREE_DELETE_ITEM, &MyTreeCtrl::OnDeleteItem, this);
+
+#if 0 // there are so many of those that logging them causes flicker
+ this->Bind(wxEVT_TREE_GET_INFO, &MyTreeCtrl::OnGetInfo, this);
+#endif
+ this->Bind(wxEVT_TREE_SET_INFO, &MyTreeCtrl::OnSetInfo, this);
+ this->Bind(wxEVT_TREE_ITEM_EXPANDED, &MyTreeCtrl::OnItemExpanded, this);
+ this->Bind(wxEVT_TREE_ITEM_EXPANDING, &MyTreeCtrl::OnItemExpanding, this);
+ this->Bind(wxEVT_TREE_ITEM_COLLAPSED, &MyTreeCtrl::OnItemCollapsed, this);
+ this->Bind(wxEVT_TREE_ITEM_COLLAPSING, &MyTreeCtrl::OnItemCollapsing, this);
+
+ this->Bind(wxEVT_TREE_SEL_CHANGED, &MyTreeCtrl::OnSelChanged, this);
+ this->Bind(wxEVT_TREE_SEL_CHANGING, &MyTreeCtrl::OnSelChanging, this);
+ this->Bind(wxEVT_TREE_KEY_DOWN, &MyTreeCtrl::OnTreeKeyDown, this);
+ this->Bind(wxEVT_TREE_ITEM_ACTIVATED, &MyTreeCtrl::OnItemActivated, this);
+ this->Bind(wxEVT_TREE_STATE_IMAGE_CLICK, &MyTreeCtrl::OnItemStateClick, this);
+
+ // so many different ways to handle right mouse button clicks...
+ this->Bind(wxEVT_CONTEXT_MENU, &MyTreeCtrl::OnContextMenu, this);
+ // wxEVT_TREE_ITEM_MENU is the preferred event for creating context menus
+ // on a tree control, because it includes the point of the click or item,
+ // meaning that no additional placement calculations are required.
+ this->Bind(wxEVT_TREE_ITEM_MENU, &MyTreeCtrl::OnItemMenu, this);
+ this->Bind(wxEVT_TREE_ITEM_RIGHT_CLICK, &MyTreeCtrl::OnItemRClick, this);
+
+ this->Bind(wxEVT_RIGHT_DOWN, &MyTreeCtrl::OnRMouseDown, this);
+ this->Bind(wxEVT_RIGHT_UP, &MyTreeCtrl::OnRMouseUp, this);
+ this->Bind(wxEVT_RIGHT_DCLICK, &MyTreeCtrl::OnRMouseDClick, this);
+
+ return true;
+}
+
+template <class TreeCtrlBase>
+MyTreeCtrl<TreeCtrlBase>::~MyTreeCtrl()
+{
+ // Avoid messages about items being deleted during destruction.
+ this->Unbind(wxEVT_TREE_DELETE_ITEM, &MyTreeCtrl::OnDeleteItem, this);
}

namespace
@@ -1000,11 +1052,12 @@ namespace
};
} // anonymous namespace

-void MyTreeCtrl::CreateImages(int size)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::CreateImages(int size)
{
if ( size == -1 )
{
- SetImageList(nullptr);
+ this->SetImageList(nullptr);
return;
}
if ( size == 0 )
@@ -1044,10 +1097,11 @@ void MyTreeCtrl::CreateImages(int size)
images.push_back(wxBitmapBundle::FromImpl(new FixedSizeImpl(iconSize, icons[i])));
}

- SetImages(images);
+ this->SetImages(images);
}

-void MyTreeCtrl::CreateStateImages()
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::CreateStateImages()
{
std::vector<wxBitmapBundle> images;

@@ -1078,15 +1132,14 @@ void MyTreeCtrl::CreateStateImages()
}
}

- SetStateImages(images);
+ this->SetStateImages(images);
}

-void MyTreeCtrl::CreateButtonsImageList(int size)
+void MyTreeCtrlInterface::CreateButtonsImageList(wxGenericTreeCtrl* treectrl, int size)
{
-#ifdef HAS_GENERIC_TREECTRL
if ( size == -1 )
{
- SetButtonsImageList(nullptr);
+ treectrl->SetButtonsImageList(nullptr);
return;
}

@@ -1127,27 +1180,26 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
}
}

- AssignButtonsImageList(images);
-#else
- wxUnusedVar(size);
-#endif
+ treectrl->AssignButtonsImageList(images);
}

-int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
- const wxTreeItemId& item2)
+template <class TreeCtrlBase>
+int MyTreeCtrl<TreeCtrlBase>::OnCompareItems(const wxTreeItemId& item1,
+ const wxTreeItemId& item2)
{
if ( m_reverseSort )
{
// just exchange 1st and 2nd items
- return wxTreeCtrl::OnCompareItems(item2, item1);
+ return TreeCtrlBase::OnCompareItems(item2, item1);
}
else
{
- return wxTreeCtrl::OnCompareItems(item1, item2);
+ return TreeCtrlBase::OnCompareItems(item1, item2);
}
}

-void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::AddItemsRecursively(const wxTreeItemId& idParent,
size_t numChildren,
size_t depth,
size_t folder)
@@ -1177,17 +1229,17 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
{
image = imageSel = -1;
}
- wxTreeItemId id = AppendItem(idParent, str, image, imageSel,
- new MyTreeItemData(str));
+ wxTreeItemId id = this->AppendItem(idParent, str, image, imageSel,
+ new MyTreeItemData(str));

if ( wxGetApp().ShowStates() )
- SetItemState(id, 0);
+ this->SetItemState(id, 0);

// and now we also set the expanded one (only for the folders)
if ( hasChildren && wxGetApp().ShowImages() )
{
- SetItemImage(id, TreeCtrlIcon_FolderOpened,
- wxTreeItemIcon_Expanded);
+ this->SetItemImage(id, TreeCtrlIcon_FolderOpened,
+ wxTreeItemIcon_Expanded);
}

AddItemsRecursively(id, numChildren, depth - 1, n + 1);
@@ -1196,44 +1248,46 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
//else: done!
}

-void MyTreeCtrl::AddTestItemsToTree(size_t numChildren,
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::AddTestItemsToTree(size_t numChildren,
size_t depth)
{
- int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_Folder : -1;
- wxTreeItemId rootId = AddRoot("Root",
- image, image,
- new MyTreeItemData("Root item"));
- if ( !HasFlag(wxTR_HIDE_ROOT) && image != -1 )
+ int image = wxGetApp().ShowImages() ? TreeCtrlIcon_Folder : -1;
+ wxTreeItemId rootId = this->AddRoot("Root",
+ image, image,
+ new MyTreeItemData("Root item"));
+ if ( !this->HasFlag(wxTR_HIDE_ROOT) && image != -1 )
{
- SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded);
+ this->SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded);
}

AddItemsRecursively(rootId, numChildren, depth, 0);

// set some colours/fonts for testing
- if ( !HasFlag(wxTR_HIDE_ROOT) )
- SetItemFont(rootId, *wxITALIC_FONT);
+ if ( !this->HasFlag(wxTR_HIDE_ROOT) )
+ this->SetItemFont(rootId, *wxITALIC_FONT);

wxTreeItemIdValue cookie;
- wxTreeItemId id = GetFirstChild(rootId, cookie);
- SetItemTextColour(id, *wxBLUE);
+ wxTreeItemId id = this->GetFirstChild(rootId, cookie);
+ this->SetItemTextColour(id, *wxBLUE);

- id = GetNextChild(rootId, cookie);
+ id = this->GetNextChild(rootId, cookie);
if ( id )
- id = GetNextChild(rootId, cookie);
+ id = this->GetNextChild(rootId, cookie);
if ( id )
{
- SetItemTextColour(id, *wxRED);
- SetItemBackgroundColour(id, *wxLIGHT_GREY);
+ this->SetItemTextColour(id, *wxRED);
+ this->SetItemBackgroundColour(id, *wxLIGHT_GREY);
}
}

-wxTreeItemId MyTreeCtrl::GetLastTreeITem() const
+template <class TreeCtrlBase>
+wxTreeItemId MyTreeCtrl<TreeCtrlBase>::GetLastTreeITem() const
{
- wxTreeItemId item = GetRootItem();
+ wxTreeItemId item = this->GetRootItem();
for ( ;; )
{
- wxTreeItemId itemChild = GetLastChild(item);
+ wxTreeItemId itemChild = this->GetLastChild(item);
if ( !itemChild.IsOk() )
break;

@@ -1243,92 +1297,97 @@ wxTreeItemId MyTreeCtrl::GetLastTreeITem() const
return item;
}

-void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent,
- wxTreeItemIdValue cookie)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::GetItemsRecursively(const wxTreeItemId& idParent,
+ wxTreeItemIdValue cookie)
{
wxTreeItemId id;

if ( !cookie )
- id = GetFirstChild(idParent, cookie);
+ id = this->GetFirstChild(idParent, cookie);
else
- id = GetNextChild(idParent, cookie);
+ id = this->GetNextChild(idParent, cookie);

if ( !id.IsOk() )
return;

- wxString text = GetItemText(id);
+ wxString text = this->GetItemText(id);
wxLogMessage(text);

- if (ItemHasChildren(id))
- GetItemsRecursively(id);
+ if ( this->ItemHasChildren(id) )
+ this->GetItemsRecursively(id);

- GetItemsRecursively(idParent, cookie);
+ this->GetItemsRecursively(idParent, cookie);
}

-void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::DoToggleIcon(const wxTreeItemId& item)
{
- int image = GetItemImage(item) == TreeCtrlIcon_Folder
+ int image = this->GetItemImage(item) == TreeCtrlIcon_Folder
? TreeCtrlIcon_File
: TreeCtrlIcon_Folder;
- SetItemImage(item, image, wxTreeItemIcon_Normal);
+ this->SetItemImage(item, image, wxTreeItemIcon_Normal);

- image = GetItemImage(item, wxTreeItemIcon_Selected) == TreeCtrlIcon_FolderSelected
+ image = this->GetItemImage(item, wxTreeItemIcon_Selected) == TreeCtrlIcon_FolderSelected
? TreeCtrlIcon_FileSelected
: TreeCtrlIcon_FolderSelected;
- SetItemImage(item, image, wxTreeItemIcon_Selected);
+ this->SetItemImage(item, image, wxTreeItemIcon_Selected);
}

-void MyTreeCtrl::DoToggleState(const wxTreeItemId& item)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::DoToggleState(const wxTreeItemId& item)
{
if ( m_alternateStates )
{
// sets random state unlike current
- int state = GetItemState(item);
+ int state = this->GetItemState(item);
int nState;

srand (time(nullptr));
do {
- nState = rand() % GetStateImageCount();
+ nState = rand() % this->GetStateImageCount();
} while (nState == state);

- SetItemState(item, nState);
+ this->SetItemState(item, nState);
}
else
{
// we have only 2 checkbox states, so next state will be reversed
- SetItemState(item, wxTREE_ITEMSTATE_NEXT);
+ this->SetItemState(item, wxTREE_ITEMSTATE_NEXT);
}
}

-void MyTreeCtrl::DoResetBrokenStateImages(const wxTreeItemId& idParent,
- wxTreeItemIdValue cookie, int state)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::DoResetBrokenStateImages(const wxTreeItemId& idParent,
+ wxTreeItemIdValue cookie, int state)
{
wxTreeItemId id;

if ( !cookie )
- id = GetFirstChild(idParent, cookie);
+ id = this->GetFirstChild(idParent, cookie);
else
- id = GetNextChild(idParent, cookie);
+ id = this->GetNextChild(idParent, cookie);

if ( !id.IsOk() )
return;

- int curState = GetItemState(id);
+ int curState = this->GetItemState(id);
if ( curState != wxTREE_ITEMSTATE_NONE && curState > state )
- SetItemState(id, state);
+ this->SetItemState(id, state);

- if (ItemHasChildren(id))
+ if (this->ItemHasChildren(id))
DoResetBrokenStateImages(id, nullptr, state);

DoResetBrokenStateImages(idParent, cookie, state);
}

-void MyTreeCtrl::LogEvent(const wxString& name, const wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::LogEvent(const wxString& name, const wxTreeEvent& event)
{
wxTreeItemId item = event.GetItem();
wxString text;
if ( item.IsOk() )
- text << '"' << GetItemText(item).c_str() << '"';
+ text << '"' << this->GetItemText(item).c_str() << '"';
else
text = "invalid item";
wxLogMessage("%s(%s)", name, text);
@@ -1336,9 +1395,10 @@ void MyTreeCtrl::LogEvent(const wxString& name, const wxTreeEvent& event)

// avoid repetition
#define TREE_EVENT_HANDLER(name) \
-void MyTreeCtrl::name(wxTreeEvent& event) \
+template <class TreeCtrlBase> \
+void MyTreeCtrl<TreeCtrlBase>::name(wxTreeEvent& event) \
{ \
- LogEvent(#name, event); \
+ LogEvent(#name, event); \
event.Skip(); \
}

@@ -1498,25 +1558,27 @@ void LogKeyEvent(const wxString& name, const wxKeyEvent& event)
event.MetaDown() ? 'M' : '-');
}

-void MyTreeCtrl::OnTreeKeyDown(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnTreeKeyDown(wxTreeEvent& event)
{
LogKeyEvent("Tree key down ", event.GetKeyEvent());

event.Skip();
}

-void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnBeginDrag(wxTreeEvent& event)
{
// need to explicitly allow drag
- if ( event.GetItem() != GetRootItem() )
+ if ( event.GetItem() != this->GetRootItem() )
{
m_draggedItem = event.GetItem();

wxPoint clientpt = event.GetPoint();
- wxPoint screenpt = ClientToScreen(clientpt);
+ wxPoint screenpt = this->ClientToScreen(clientpt);

wxLogMessage("OnBeginDrag: started dragging %s at screen coords (%i,%i)",
- GetItemText(m_draggedItem),
+ this->GetItemText(m_draggedItem),
screenpt.x, screenpt.y);

event.Allow();
@@ -1527,17 +1589,18 @@ void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
}
}

-void MyTreeCtrl::OnEndDrag(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnEndDrag(wxTreeEvent& event)
{
wxTreeItemId itemSrc = m_draggedItem,
itemDst = event.GetItem();
m_draggedItem = nullptr;

// where to copy the item?
- if ( itemDst.IsOk() && !ItemHasChildren(itemDst) )
+ if ( itemDst.IsOk() && !this->ItemHasChildren(itemDst) )
{
// copy to the parent then
- itemDst = GetItemParent(itemDst);
+ itemDst = this->GetItemParent(itemDst);
}

if ( !itemDst.IsOk() )
@@ -1547,9 +1610,9 @@ void MyTreeCtrl::OnEndDrag(wxTreeEvent& event)
return;
}

- wxString text = GetItemText(itemSrc);
+ wxString text = this->GetItemText(itemSrc);
wxLogMessage("OnEndDrag: '%s' copied to '%s'.",
- text, GetItemText(itemDst));
+ text, this->GetItemText(itemDst));

// just do append here - we could also insert it just before/after the item
// on which it was dropped, but this requires slightly more work... we also
@@ -1559,13 +1622,14 @@ void MyTreeCtrl::OnEndDrag(wxTreeEvent& event)
// Finally, we only copy one item here but we might copy the entire tree if
// we were dragging a folder.
int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1;
- wxTreeItemId id = AppendItem(itemDst, text, image);
+ wxTreeItemId id = this->AppendItem(itemDst, text, image);

if ( wxGetApp().ShowStates() )
- SetItemState(id, GetItemState(itemSrc));
+ this->SetItemState(id, this->GetItemState(itemSrc));
}

-void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnBeginLabelEdit(wxTreeEvent& event)
{
wxLogMessage("OnBeginLabelEdit");

@@ -1577,14 +1641,15 @@ void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)

event.Veto();
}
- else if ( itemId == GetRootItem() )
+ else if ( itemId == this->GetRootItem() )
{
// test that it is possible to change the text of the item being edited
- SetItemText(itemId, "Editing root item");
+ this->SetItemText(itemId, "Editing root item");
}
}

-void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnEndLabelEdit(wxTreeEvent& event)
{
wxLogMessage("OnEndLabelEdit");

@@ -1597,7 +1662,8 @@ void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
}
}

-void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnItemCollapsing(wxTreeEvent& event)
{
wxLogMessage("OnItemCollapsing");

@@ -1611,11 +1677,12 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
}
}

-void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnItemActivated(wxTreeEvent& event)
{
// show some info about this item
wxTreeItemId itemId = event.GetItem();
- MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
+ MyTreeItemData *item = (MyTreeItemData *)this->GetItemData(itemId);

if ( item != nullptr )
{
@@ -1625,24 +1692,26 @@ void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)
wxLogMessage("OnItemActivated");
}

-void MyTreeCtrl::OnItemStateClick(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnItemStateClick(wxTreeEvent& event)
{
// toggle item state
wxTreeItemId itemId = event.GetItem();
DoToggleState(itemId);

wxLogMessage("Item \"%s\" state changed to %d",
- GetItemText(itemId), GetItemState(itemId));
+ this->GetItemText(itemId), this->GetItemState(itemId));
}

-void MyTreeCtrl::OnItemMenu(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnItemMenu(wxTreeEvent& event)
{
wxTreeItemId itemId = event.GetItem();
wxCHECK_RET( itemId.IsOk(), "should have a valid item" );

- MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
+ MyTreeItemData *item = (MyTreeItemData *)this->GetItemData(itemId);
wxPoint clientpt = event.GetPoint();
- wxPoint screenpt = ClientToScreen(clientpt);
+ wxPoint screenpt = this->ClientToScreen(clientpt);

wxLogMessage("OnItemMenu for item \"%s\" at screen coords (%i, %i)",
item ? item->GetDesc() : wxString("unknown"), screenpt.x, screenpt.y);
@@ -1651,7 +1720,8 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event)
event.Skip();
}

-void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnContextMenu(wxContextMenuEvent& event)
{
wxPoint pt = event.GetPosition();

@@ -1660,12 +1730,13 @@ void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
event.Skip();
}

-void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::ShowMenu(wxTreeItemId id, const wxPoint& pt)
{
wxString title;
if ( id.IsOk() )
{
- title << "Menu for " << GetItemText(id);
+ title << "Menu for " << this->GetItemText(id);
}
else
{
@@ -1679,46 +1750,50 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt)
menu.Append(TreeTest_Highlight, "&Highlight item");
menu.Append(TreeTest_Dump, "&Dump");

- PopupMenu(&menu, pt);
+ this->PopupMenu(&menu, pt);
#endif // wxUSE_MENUS
}

-void MyTreeCtrl::OnItemRClick(wxTreeEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnItemRClick(wxTreeEvent& event)
{
wxTreeItemId itemId = event.GetItem();
wxCHECK_RET( itemId.IsOk(), "should have a valid item" );

- MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
+ MyTreeItemData *item = (MyTreeItemData *)this->GetItemData(itemId);

wxLogMessage("Item \"%s\" right clicked", item ? item->GetDesc() : wxString("unknown"));

event.Skip();
}

-void MyTreeCtrl::OnRMouseDown(wxMouseEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnRMouseDown(wxMouseEvent& event)
{
wxLogMessage("Right mouse button down");

event.Skip();
}

-void MyTreeCtrl::OnRMouseUp(wxMouseEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnRMouseUp(wxMouseEvent& event)
{
wxLogMessage("Right mouse button up");

event.Skip();
}

-void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event)
+template <class TreeCtrlBase>
+void MyTreeCtrl<TreeCtrlBase>::OnRMouseDClick(wxMouseEvent& event)
{
- wxTreeItemId id = HitTest(event.GetPosition());
+ wxTreeItemId id = this->HitTest(event.GetPosition());
if ( !id )
{
wxLogMessage("No item under mouse");
}
else
{
- MyTreeItemData *item = (MyTreeItemData *)GetItemData(id);
+ MyTreeItemData *item = (MyTreeItemData *)this->GetItemData(id);
if ( item )
{
wxLogMessage("Item '%s' under mouse", item->GetDesc());
@@ -1733,7 +1808,7 @@ static inline const wxString Bool2String(bool b)
return b ? "" : "not ";
}

-void MyTreeItemData::ShowInfo(wxTreeCtrl *tree)
+void MyTreeItemData::ShowInfo(wxTreeCtrlBase *tree)
{
wxLogMessage("Item '%s': %sselected, %sexpanded, %sbold,\n"
"%u children (%u immediately under this item).",


=====================================
samples/treectrl/treetest.h
=====================================
@@ -7,23 +7,14 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

-// This can be defined to 1 to force using wxGenericTreeCtrl even on the
-// platforms where the native controls would normally be used (wxMSW and wxQt).
-#define USE_GENERIC_TREECTRL 0
-
-#if USE_GENERIC_TREECTRL
-#include "wx/generic/treectlg.h"
-#ifndef wxTreeCtrl
-#define wxTreeCtrl wxGenericTreeCtrl
-#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
-#endif
-#endif
-
-// This one is defined if we're actually using the generic control, either
-// because it was explicitly requested above or because there is no other one
-// on this platform anyhow.
-#if USE_GENERIC_TREECTRL || (!defined(__WXMSW__) && !defined(__WXQT__))
- #define HAS_GENERIC_TREECTRL
+// If native control is available, allow to also use the generic one for
+// testing.
+#ifndef wxHAS_GENERIC_TREECTRL
+ #include "wx/generic/treectlg.h"
+
+ #define wxUSE_ALT_GENERIC_TREECTRL 1
+#else
+ #define wxUSE_ALT_GENERIC_TREECTRL 0
#endif

// Define a new application type
@@ -52,30 +43,82 @@ class MyTreeItemData : public wxTreeItemData
public:
MyTreeItemData(const wxString& desc) : m_desc(desc) { }

- void ShowInfo(wxTreeCtrl *tree);
+ void ShowInfo(wxTreeCtrlBase *tree);
wxString const& GetDesc() const { return m_desc; }

private:
wxString m_desc;
};

-class MyTreeCtrl : public wxTreeCtrl
+enum
+{
+ TreeCtrlIcon_File,
+ TreeCtrlIcon_FileSelected,
+ TreeCtrlIcon_Folder,
+ TreeCtrlIcon_FolderSelected,
+ TreeCtrlIcon_FolderOpened
+};
+
+// This interface defines some helper functions that are used by the sample to
+// perform operations on the tree control without knowing its exact type
+// (native or generic).
+//
+// It's not a pure interface as it also contains some data members, but this is
+// just done for convenience to allow implementing some trivial functions
+// directly in it. Its meaning is still that it defines the interface used by
+// MyFrame to manipulate the tree control.
+class MyTreeCtrlInterface
{
public:
- enum
- {
- TreeCtrlIcon_File,
- TreeCtrlIcon_FileSelected,
- TreeCtrlIcon_Folder,
- TreeCtrlIcon_FolderSelected,
- TreeCtrlIcon_FolderOpened
- };
-
- MyTreeCtrl() { m_alternateImages = false; m_alternateStates = false; }
- MyTreeCtrl(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style);
- virtual ~MyTreeCtrl(){}
+ virtual ~MyTreeCtrlInterface() = default;
+
+ virtual void CreateImages(int size) = 0;
+ virtual void CreateStateImages() = 0;
+
+ // This one can be only used with wxGenericTreeCtrl currently, so it takes
+ // it as argument.
+ void CreateButtonsImageList(wxGenericTreeCtrl* treectrl, int size);
+
+ virtual void AddTestItemsToTree(size_t numChildren, size_t depth) = 0;
+
+ int ImageSize() const { return m_imageSize; }
+
+ void SetAlternateImages(bool show) { m_alternateImages = show; }
+ bool AlternateImages() const { return m_alternateImages; }
+
+ void SetAlternateStates(bool show) { m_alternateStates = show; }
+ bool AlternateStates() const { return m_alternateStates; }
+
+ virtual void ResetBrokenStateImages() = 0;
+ virtual void DoToggleIcon(const wxTreeItemId& item) = 0;
+ virtual void DoToggleState(const wxTreeItemId& item) = 0;
+ virtual wxTreeItemId GetLastTreeITem() const = 0;
+ virtual void GetItemsRecursively(const wxTreeItemId& idParent,
+ wxTreeItemIdValue cookie = nullptr) = 0;
+ virtual void DoSortChildren(const wxTreeItemId& item, bool reverse) = 0;
+
+protected:
+ int m_imageSize; // current size of images
+ bool m_alternateImages = false;
+ bool m_alternateStates = false;
+};
+
+// This template can be instantiated for either wxTreeCtrl or wxGenericTreeCtrl.
+//
+// Please note that this class is a template just for idiosyncratic reasons in
+// this sample, you wouldn't write your real code in this way and would either
+// just use wxTreeCtrl or wxGenericTreeCtrl directly or use composition instead
+// of inheritance. In other words, do not follow this example in your code.
+template <class TreeCtrlBase>
+class MyTreeCtrl : public TreeCtrlBase, public MyTreeCtrlInterface
+{
+public:
+ MyTreeCtrl() = default;
+ bool Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ long style);
+
+ virtual ~MyTreeCtrl();

void OnBeginDrag(wxTreeEvent& event);
void OnBeginRDrag(wxTreeEvent& event);
@@ -102,42 +145,33 @@ public:
void OnRMouseUp(wxMouseEvent& event);
void OnRMouseDClick(wxMouseEvent& event);

- wxTreeItemId GetLastTreeITem() const;
+ wxTreeItemId GetLastTreeITem() const override;
void GetItemsRecursively(const wxTreeItemId& idParent,
- wxTreeItemIdValue cookie = nullptr);
+ wxTreeItemIdValue cookie = nullptr) override;

// This function behaves differently depending on the value of size:
// - If it's -1, it turns off the use of images entirely.
// - If it's 0, it reuses the last used size.
// - If it's strictly positive, it creates icons in this size.
- void CreateImages(int size);
+ void CreateImages(int size) override;

- void CreateButtonsImageList(int size = 11);
- void CreateStateImages();
+ void CreateStateImages() override;

- void AddTestItemsToTree(size_t numChildren, size_t depth);
+ void AddTestItemsToTree(size_t numChildren, size_t depth) override;

- void DoSortChildren(const wxTreeItemId& item, bool reverse = false)
- { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
+ void DoSortChildren(const wxTreeItemId& item, bool reverse) override
+ { m_reverseSort = reverse; TreeCtrlBase::SortChildren(item); }

- void DoToggleIcon(const wxTreeItemId& item);
- void DoToggleState(const wxTreeItemId& item);
+ void DoToggleIcon(const wxTreeItemId& item) override;
+ void DoToggleState(const wxTreeItemId& item) override;

void ShowMenu(wxTreeItemId id, const wxPoint& pt);

- int ImageSize(void) const { return m_imageSize; }
-
- void SetAlternateImages(bool show) { m_alternateImages = show; }
- bool AlternateImages() const { return m_alternateImages; }
-
- void SetAlternateStates(bool show) { m_alternateStates = show; }
- bool AlternateStates() const { return m_alternateStates; }
-
- void ResetBrokenStateImages()
+ void ResetBrokenStateImages() override
{
- const size_t count = GetStateImageList()->GetImageCount();
+ const size_t count = this->GetStateImageList()->GetImageCount();
int state = count > 0 ? count - 1 : wxTREE_ITEMSTATE_NONE;
- DoResetBrokenStateImages(GetRootItem(), nullptr, state);
+ DoResetBrokenStateImages(this->GetRootItem(), nullptr, state);
}

protected:
@@ -147,7 +181,7 @@ protected:
bool IsTestItem(const wxTreeItemId& item)
{
// the test item is the first child folder
- return GetItemParent(item) == GetRootItem() && !GetPrevSibling(item);
+ return this->GetItemParent(item) == this->GetRootItem() && !this->GetPrevSibling(item);
}

private:
@@ -162,18 +196,14 @@ private:

void LogEvent(const wxString& name, const wxTreeEvent& event);

- int m_imageSize; // current size of images
- bool m_reverseSort; // flag for OnCompareItems
+ bool m_reverseSort = false; // flag for OnCompareItems
wxTreeItemId m_draggedItem; // item being dragged right now
- bool m_alternateImages;
- bool m_alternateStates;

// NB: due to an ugly wxMSW hack you _must_ use wxDECLARE_DYNAMIC_CLASS();
// if you want your overloaded OnCompareItems() to be called.
// OTOH, if you don't want it you may omit the next line - this will
// make default (alphabetical) sorting much faster under wxMSW.
wxDECLARE_DYNAMIC_CLASS(MyTreeCtrl);
- wxDECLARE_EVENT_TABLE();
};

// Define a new frame type
@@ -206,6 +236,10 @@ public:
void OnTogFullHighlight(wxCommandEvent& event)
{ TogStyle(event.GetId(), wxTR_FULL_ROW_HIGHLIGHT); }

+#if wxUSE_ALT_GENERIC_TREECTRL
+ void OnUseGeneric(wxCommandEvent& event);
+#endif // wxUSE_ALT_GENERIC_TREECTRL
+
void OnResetStyle(wxCommandEvent& WXUNUSED(event))
{ CreateTreeWithDefStyle(); }

@@ -266,23 +300,23 @@ public:
void OnToggleState(wxCommandEvent& event);

void OnShowFirstVisible(wxCommandEvent& WXUNUSED(event))
- { DoShowFirstOrLast(&wxTreeCtrl::GetFirstVisibleItem, "first visible"); }
+ { DoShowFirstOrLast(&wxTreeCtrlBase::GetFirstVisibleItem, "first visible"); }
#ifdef wxHAS_LAST_VISIBLE // we don't have it currently but may add later
void OnShowLastVisible(wxCommandEvent& WXUNUSED(event))
- { DoShowFirstOrLast(&wxTreeCtrl::GetLastVisibleItem, "last visible"); }
+ { DoShowFirstOrLast(&wxTreeCtrlBase::GetLastVisibleItem, "last visible"); }
#endif // wxHAS_LAST_VISIBLE

void OnShowNextVisible(wxCommandEvent& WXUNUSED(event))
- { DoShowRelativeItem(&wxTreeCtrl::GetNextVisible, "next visible"); }
+ { DoShowRelativeItem(&wxTreeCtrlBase::GetNextVisible, "next visible"); }
void OnShowPrevVisible(wxCommandEvent& WXUNUSED(event))
- { DoShowRelativeItem(&wxTreeCtrl::GetPrevVisible, "previous visible"); }
+ { DoShowRelativeItem(&wxTreeCtrlBase::GetPrevVisible, "previous visible"); }

void OnShowParent(wxCommandEvent& WXUNUSED(event))
- { DoShowRelativeItem(&wxTreeCtrl::GetItemParent, "parent"); }
+ { DoShowRelativeItem(&wxTreeCtrlBase::GetItemParent, "parent"); }
void OnShowPrevSibling(wxCommandEvent& WXUNUSED(event))
- { DoShowRelativeItem(&wxTreeCtrl::GetPrevSibling, "previous sibling"); }
+ { DoShowRelativeItem(&wxTreeCtrlBase::GetPrevSibling, "previous sibling"); }
void OnShowNextSibling(wxCommandEvent& WXUNUSED(event))
- { DoShowRelativeItem(&wxTreeCtrl::GetNextSibling, "next sibling"); }
+ { DoShowRelativeItem(&wxTreeCtrlBase::GetNextSibling, "next sibling"); }

void OnScrollTo(wxCommandEvent& event);
void OnSelectLast(wxCommandEvent& event);
@@ -301,17 +335,18 @@ private:
void CreateTree(long style);

// common parts of OnShowFirst/LastVisible() and OnShowNext/PrevVisible()
- typedef wxTreeItemId (wxTreeCtrl::*TreeFunc0_t)() const;
+ typedef wxTreeItemId (wxTreeCtrlBase::*TreeFunc0_t)() const;
void DoShowFirstOrLast(TreeFunc0_t pfn, const wxString& label);

- typedef wxTreeItemId (wxTreeCtrl::*TreeFunc1_t)(const wxTreeItemId&) const;
+ typedef wxTreeItemId (wxTreeCtrlBase::*TreeFunc1_t)(const wxTreeItemId&) const;
void DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label);


- wxPanel *m_panel;
- MyTreeCtrl *m_treeCtrl;
+ wxPanel *m_panel = nullptr;
+ wxTreeCtrlBase *m_treeCtrl = nullptr;
+ MyTreeCtrlInterface *m_treeCtrlIface = nullptr;
#if wxUSE_LOG
- wxTextCtrl *m_textCtrl;
+ wxTextCtrl *m_textCtrl = nullptr;
#endif // wxUSE_LOG

void DoSetBold(bool bold = true);
@@ -335,6 +370,9 @@ enum
TreeTest_TogFullHighlight,
TreeTest_SetFgColour,
TreeTest_SetBgColour,
+#if wxUSE_ALT_GENERIC_TREECTRL
+ TreeTest_UseGeneric,
+#endif // wxUSE_ALT_GENERIC_TREECTRL
TreeTest_ResetStyle,
TreeTest_Highlight,
TreeTest_Dump,


=====================================
src/generic/listctrl.cpp
=====================================
@@ -658,10 +658,7 @@ void wxListLineData::ApplyAttributes(wxDC *dc,
else
colText = *wxBLACK;
#else
- if ( hasFocus )
- colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
- else
- colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
#endif
}
else if ( attr && attr->HasTextColour() )


=====================================
src/generic/treectlg.cpp
=====================================
@@ -2796,10 +2796,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
if (m_hasFocus)
colText = *wxWHITE;
#else
- if (m_hasFocus)
- colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
- else
- colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
#endif
}
else


=====================================
src/msw/renderer.cpp
=====================================
@@ -929,7 +929,7 @@ wxRendererXP::DrawItemSelectionRect(wxWindow *win,
const wxRect& rect,
int flags)
{
- wxUxThemeHandle hTheme(win, L"EXPLORER::LISTVIEW;LISTVIEW");
+ wxUxThemeHandle hTheme(win, L"EXPLORER::LISTVIEW;LISTVIEW", L"DarkMode::LISTVIEW");

const int itemState = GetListItemState(flags);



=====================================
src/msw/settings.cpp
=====================================
@@ -124,7 +124,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
else if ( index == wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT)
{
// there is no standard colour with this index, map to another one
- index = wxSYS_COLOUR_HIGHLIGHTTEXT;
+ index = wxSYS_COLOUR_LISTBOXTEXT;
}
else if ( index == wxSYS_COLOUR_LISTBOX )
{



View it on GitLab: https://gitlab.com/wxwidgets/wxwidgets/-/compare/c9696340f8c54cd70076c996514191716bcea7bb...21b5e055cacc074f7216804e37c6257938c7efc3

--
View it on GitLab: https://gitlab.com/wxwidgets/wxwidgets/-/compare/c9696340f8c54cd70076c996514191716bcea7bb...21b5e055cacc074f7216804e37c6257938c7efc3
You're receiving this email because of your account on gitlab.com.