[Git][wxwidgets/wxwidgets][master] 5 commits: Fix progress bar in native wxMSW wxProgressDialog in dark mode

6 views
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Sep 16, 2026, 5:51:07 PMSep 16
to wx-commi...@googlegroups.com


Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets


Commits:
bf452c02 by Steve Cornett at 2026-09-16T20:07:09+02:00
Fix progress bar in native wxMSW wxProgressDialog in dark mode

To enable dark mode with the task dialog progress bar, use the same
technique as wxGauge.

Closes #27013.

- - - - -
0b744dd4 by Seth Hillbrand at 2026-09-16T13:02:39-07:00
Fix remaining MSW wxFileSystemWatcher threading races

The worker thread checked whether a watch was still used by looking it up
in wxFSWatcherImpl::m_watches, which is modified by the main thread in
Add(), Remove() and RemoveAll() without any locking. And even with the
locking added in wxIOCPService, the watch could still be removed between
checking for its removal and starting a new read for it, leaving a pending
read on a watch nobody uses any more.

Check whether the watch was scheduled for removal and start the new read
while holding the wxIOCPService lock, and complete the removal instead if
it was.

Also register the watch with wxIOCPService before starting the first read
for it, so that the worker thread can't get a completion for a watch it
doesn't know about yet.

- - - - -
06ffddba by Seth Hillbrand at 2026-09-16T13:03:00-07:00
Don't stop MSW wxFileSystemWatcher when a watched directory is deleted

The IOCP worker thread exited when one of the watched directories was
deleted, silently stopping the events for all the other watches of the
same wxFileSystemWatcher. Just stop reading the events for the deleted
directory and keep processing the other ones.

- - - - -
54b55ed9 by Vadim Zeitlin at 2026-09-16T23:14:55+02:00
Merge branch 'MSW-fswatcher' of github.com:sethhillbrand/wxWidgets

Fix the remaining races in MSW file watcher and keep watching if a
directory is removed.

See #27012.

- - - - -
dc45d2dc by Blake-Madden at 2026-09-16T23:23:25+02:00
Remove draw_test testing harness

This was always built, but never ran. The SVG GC portion would only
throw exceptions, and the other drawing portions relied on pixel
comparisons, which would not age well as tests. These tests were dead
weight to the build system and need to be replaced later with a
different approach.

Closes #27015.

- - - - -


22 changed files:

- .github/workflows/ci_cmake.yml
- build/cmake/tests/CMakeLists.txt
- − build/cmake/tests/drawing/CMakeLists.txt
- build/tools/appveyor-test.bat
- include/wx/msw/private/fswatcher.h
- src/msw/fswatcher.cpp
- src/msw/taskdlg.cpp
- tests/Makefile.in
- − tests/drawing/basictest.cpp
- − tests/drawing/drawing.cpp
- − tests/drawing/drawing.h
- − tests/drawing/fonttest.cpp
- − tests/drawing/readme.txt
- − tests/drawing/references/image_test_image_cairo-1.8_2_ref.png
- − tests/drawing/references/image_test_image_cg-10.5_2_ref.png
- − tests/drawing/references/image_test_image_gdiplus-6.1_2_ref.png
- − tests/drawing/references/readme.txt
- − tests/drawing/testimagefile.h
- tests/fswatcher/fswatchertest.cpp
- tests/makefile.gcc
- tests/makefile.vc
- tests/test.bkl


Changes:

=====================================
.github/workflows/ci_cmake.yml
=====================================
@@ -250,7 +250,7 @@ jobs:

httpbin_launch

- ctest -V -C Debug -E test_drawing --output-on-failure --interactive-debug-mode 0 . || rc=$?
+ ctest -V -C Debug --output-on-failure --interactive-debug-mode 0 . || rc=$?
if [ -n "$rc" ]; then
httpbin_show_log
exit $rc


=====================================
build/cmake/tests/CMakeLists.txt
=====================================
@@ -8,7 +8,6 @@
#############################################################################

add_subdirectory(base)
-add_subdirectory(drawing)
add_subdirectory(gui)
add_subdirectory(headers)
if(WIN32)


=====================================
build/cmake/tests/drawing/CMakeLists.txt deleted
=====================================
@@ -1,41 +0,0 @@
-#############################################################################
-# Name: build/cmake/tests/drawing/CMakeLists.txt
-# Purpose: CMake file for drawing test
-# Author: Tobias Taschner
-# Created: 2016-10-31
-# Copyright: (c) 2016 wxWidgets development team
-# Licence: wxWindows licence
-#############################################################################
-
-# This test program is targeted to "headless GUI" tests, tests which are
-# typically tied to the "core" component but that should run nicely in a
-# console only program. This program should be executable from a console
-# only Unix session (such as telnet or ssh) although it uses graphics
-# contexts, so if you modify this project, please check that it can still
-# be ran in such configuration and doesn't require an X server connection.
-set(TEST_DRAWING_SRC
- test.cpp
- testableframe.cpp
- drawing/drawing.cpp
- drawing/basictest.cpp
- drawing/fonttest.cpp
-
- testprec.h
- testableframe.h
- testimage.h
- drawing/drawing.h
- drawing/testimagefile.h
- )
-
-set(TEST_DRAWING_DATA
- drawing/references/image_test_image_cairo-1.8_2_ref.png
- drawing/references/image_test_image_cg-10.5_2_ref.png
- drawing/references/image_test_image_gdiplus-6.1_2_ref.png
- )
-
-wx_add_test(test_drawing CONSOLE_GUI ${TEST_DRAWING_SRC}
- DATA ${TEST_DRAWING_DATA}
- )
-if(wxUSE_SOCKETS)
- wx_exe_link_libraries(test_drawing wxnet)
-endif()


=====================================
build/tools/appveyor-test.bat
=====================================
@@ -54,9 +54,8 @@ goto :cmake

:cmake
if "%CONFIGURATION%"=="" set CONFIGURATION=Release
-if "%CMAKE_TEST_REGEX%"=="" set CMAKE_TEST_REGEX="test_drawing"
cd ..\build_cmake
-ctest -V -C %CONFIGURATION% -E %CMAKE_TEST_REGEX% --output-on-failure --interactive-debug-mode 0 .
+ctest -V -C %CONFIGURATION% --output-on-failure --interactive-debug-mode 0 .
if %errorlevel% NEQ 0 goto :error
goto :eof



=====================================
include/wx/msw/private/fswatcher.h
=====================================
@@ -266,6 +266,23 @@ public:
return false;
}

+ // Forget a watch successfully passed to Add() if no read could be started
+ // for it: as there is no pending I/O using it, it can be dropped at once.
+ void CancelAdd(const wxSharedPtr<wxFSWatchEntryMSW>& watch)
+ {
+ wxCriticalSectionLocker lock(m_critsect);
+
+ const auto it = m_watches.find(watch->GetPath());
+
+ if ( it != m_watches.end() && it->second.get() == watch.get() )
+ {
+ m_watches.erase(it);
+ return;
+ }
+
+ wxFAIL_MSG("No watch to cancel");
+ }
+
// post completion packet
bool PostEmptyStatus()
{
@@ -348,6 +365,7 @@ protected:
HANDLE m_iocp;

// Protects the watch lists shared by the user thread and IOCP thread.
+ // wxFSWatcherImplMSW::SetUpWatch() holds it while starting a new read.
wxCriticalSection m_critsect;

// The hash containing all the wxFSWatchEntryMSW objects currently being
@@ -357,6 +375,8 @@ protected:
// Contains the watches which had been removed but are still pending.
typedef wxVector< wxSharedPtr<wxFSWatchEntryMSW> > Watches;
Watches m_removedWatches;
+
+ friend class wxFSWatcherImplMSW;
};




=====================================
src/msw/fswatcher.cpp
=====================================
@@ -95,12 +95,20 @@ bool wxFSWatcherImplMSW::Init()
// adds watch to be monitored for file system changes
bool wxFSWatcherImplMSW::DoAdd(wxSharedPtr<wxFSWatchEntryMSW> watch)
{
- // setting up wait for directory changes
- if (!DoSetUpWatch(*watch))
+ // Associate the handle with the completion port and register the watch
+ // before starting to wait for directory changes: otherwise the worker
+ // thread could get a completion for a watch it doesn't know about yet and
+ // would never start a new read for it.
+ if ( !m_iocp.Add(watch) )
return false;

- // associating handle with completion port
- return m_iocp.Add(watch);
+ if ( !DoSetUpWatch(*watch) )
+ {
+ m_iocp.CancelAdd(watch);
+ return false;
+ }
+
+ return true;
}

bool
@@ -109,18 +117,21 @@ wxFSWatcherImplMSW::DoRemove(wxSharedPtr<wxFSWatchEntryMSW> watch)
return m_iocp.ScheduleForRemoval(watch);
}

-// TODO ensuring that we have not already set watch for this handle/dir?
+// This is called from the worker thread, so it must not use m_watches, which is
+// only used by the main thread, and asks wxIOCPService instead.
bool wxFSWatcherImplMSW::SetUpWatch(wxFSWatchEntryMSW& watch)
{
wxCHECK_MSG( watch.IsOk(), false, "Invalid watch" );
- if (m_watches.find(watch.GetPath()) == m_watches.end())
- {
- wxLogTrace(wxTRACE_FSWATCHER, "Path '%s' is not watched",
- watch.GetPath());
+
+ // Don't let the watch be removed between checking for it and starting a
+ // new read. CompleteRemoval() locks the same recursive critical section.
+ wxCriticalSectionLocker lock(m_iocp.m_critsect);
+
+ if ( m_iocp.CompleteRemoval(&watch) )
return false;
- }

wxLogTrace(wxTRACE_FSWATCHER, "Setting up watch for file system changes...");
+
return DoSetUpWatch(watch);
}

@@ -245,8 +256,9 @@ bool wxIOCPThread::ReadEvents()
// It isn't useful to continue watching this directory as it
// doesn't exist any more -- and even recreating a directory with
// the same name still wouldn't resume generating events for the
- // existing wxIOCPService, so it's useless to continue.
- return false;
+ // existing wxIOCPService, so don't start a new read for it. But
+ // keep reading the events for all the other watches, if any.
+ return true;

case wxIOCPService::Status_Exit:
return false; // stop reading events
@@ -306,10 +318,9 @@ bool wxIOCPThread::ReadEvents()
// process events
ProcessNativeEvents(events);

- if ( m_iocp->CompleteRemoval(watch) )
- return true;
-
- // reissue the watch. ignore possible errors, we will return true anyway
+ // reissue the watch unless it was removed while processing the events, in
+ // which case this completes its removal. ignore possible errors, we will
+ // return true anyway
(void) m_service->SetUpWatch(*watch);

return true;


=====================================
src/msw/taskdlg.cpp
=====================================
@@ -1068,13 +1068,18 @@ void TDApplyToChildren(IUIAutomationElement* pEl)

if ( ct == UIA_ProgressBarControlTypeId )
{
- wxMSWDarkMode::SetTheme
- (
- hBtn,
- wxHasRealDarkTheme(L"Progress", L"DarkMode_CopyEngine::Progress")
- ? L"DarkMode_CopyEngine"
- : L"DarkMode_Explorer"
- );
+ if ( wxMSWDarkMode::HasDarkTheme() )
+ {
+ ::SetWindowTheme(hBtn, L"DarkMode_DarkTheme", L"Progress");
+ }
+ else
+ {
+ // Disable visual styles so colour messages take effect.
+ ::SetWindowTheme(hBtn, L"", L"");
+ // Colours taken from a progress bar with DarkMode_DarkTheme.
+ ::SendMessage(hBtn, PBM_SETBKCOLOR, 0, 0x131313);
+ ::SendMessage(hBtn, PBM_SETBARCOLOR, 0, 0x5fcb6c);
+ }
}
else if ( ct == UIA_RadioButtonControlTypeId ||
id.find(L"RadioButton_") == 0 ||


=====================================
tests/Makefile.in
=====================================
@@ -146,19 +146,6 @@ TEST_OBJECTS = \
test_xlocale.o \
test_xmltest.o
TEST_ODEP = $(_____pch_testprec_test_testprec_h_gch___depname)
-TEST_DRAWING_CXXFLAGS = $(__test_drawing_PCH_INC) $(WX_CPPFLAGS) \
- -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) \
- $(CATCH2_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
-TEST_DRAWING_OBJECTS = \
- $(__test_drawing___win32rc) \
- test_drawing_test.o \
- test_drawing_drawing.o \
- test_drawing_basictest.o \
- test_drawing_fonttest.o
-TEST_DRAWING_ODEP = \
- $(_____pch_testprec_test_drawing_testprec_h_gch___depname)
TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
@@ -317,17 +304,6 @@ TEST_ALLHEADERS_ODEP = \
@COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch
@COND_PLATFORM_WIN32_1@__test___win32rc = test_test_rc.o
@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
-@COND_USE_GUI_1@__test_drawing___depname = test_drawing$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__test_drawing___win32rc = test_drawing_test_rc.o
-@COND_GCC_PCH_1@__test_drawing_PCH_INC = -I./.pch/testprec_test_drawing
-@COND_ICC_PCH_1@__test_drawing_PCH_INC = \
-@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \
-@COND_ICC_PCH_1@ ./.pch/testprec_test_drawing/testprec.h.gch
-@COND_USE_PCH_1@_____pch_testprec_test_drawing_testprec_h_gch___depname \
-@COND_USE_PCH_1@ = ./.pch/testprec_test_drawing/testprec.h.gch
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
@COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_gui.app/Contents/PkgInfo
@@ -367,9 +343,9 @@ COND_MONOLITHIC_0___WXLIB_HTML_p = \
COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_PROPGRID_p = $(COND_MONOLITHIC_0___WXLIB_PROPGRID_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
@COND_USE_GUI_1@__test_allheaders___depname = test_allheaders$(EXEEXT)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_allheaders_app_Contents_PkgInfo___depname \
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_allheaders.app/Contents/PkgInfo
@@ -397,24 +373,24 @@ COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \
@COND_ICC_PCH_1@ ./.pch/testprec_test_allheaders/testprec.h.gch
@COND_USE_PCH_1@_____pch_testprec_test_allheaders_testprec_h_gch___depname \
@COND_USE_PCH_1@ = ./.pch/testprec_test_allheaders/testprec.h.gch
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_2 \
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
COND_MONOLITHIC_0___WXLIB_XML_p = \
-lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_9 = --define __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_9 = --define wxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_9 = --define wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_9 = --define wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_6 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_9 = --define wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_6 = --define wxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_9 = --define WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_6 = --define WXUSINGDLL
@COND_PLATFORM_WIN32_1@__WIN32_DPI_MANIFEST_p = \
@COND_PLATFORM_WIN32_1@ --define \
@COND_PLATFORM_WIN32_1@ wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
@@ -466,7 +442,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \

### Targets: ###

-all: test$(EXEEXT) $(__test_drawing___depname) $(__test_gui___depname) $(__test_gui_bundle___depname) $(__test_allheaders___depname) $(__test_allheaders_bundle___depname) data data-image-sample data-images en_GB fr ja xart-dothraki
+all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) $(__test_allheaders___depname) $(__test_allheaders_bundle___depname) data data-image-sample data-images en_GB fr ja xart-dothraki

install:

@@ -478,7 +454,6 @@ clean:
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f test$(EXEEXT)
- rm -f test_drawing$(EXEEXT)
rm -f test_gui$(EXEEXT)
rm -rf test_gui.app
rm -f test_allheaders$(EXEEXT)
@@ -493,14 +468,8 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
@COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)

-@COND_USE_GUI_1@test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS) $(__test_drawing___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-
-@COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS)
-
@COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

@COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns $(top_srcdir)/tests/horse.png $(top_srcdir)/include/wx/msw/bullseye.cur
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents
@@ -534,7 +503,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS)

@COND_USE_GUI_1@test_allheaders$(EXEEXT): $(TEST_ALLHEADERS_OBJECTS) $(__test_allheaders___win32rc)
-@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_2) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

@COND_PLATFORM_MACOSX_1_USE_GUI_1@test_allheaders.app/Contents/PkgInfo: $(__test_allheaders___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_allheaders.app/Contents
@@ -651,7 +620,7 @@ xart-dothraki:
done

test_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define TEST_HAS_IPC_SERVER
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_6) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define TEST_HAS_IPC_SERVER

test_test.o: $(srcdir)/test.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
@@ -914,23 +883,8 @@ test_xlocale.o: $(srcdir)/xlocale/xlocale.cpp $(TEST_ODEP)
test_xmltest.o: $(srcdir)/xml/xmltest.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xml/xmltest.cpp

-test_drawing_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_DRAWING_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-test_drawing_test.o: $(srcdir)/test.cpp $(TEST_DRAWING_ODEP)
- $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/test.cpp
-
-test_drawing_drawing.o: $(srcdir)/drawing/drawing.cpp $(TEST_DRAWING_ODEP)
- $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/drawing.cpp
-
-test_drawing_basictest.o: $(srcdir)/drawing/basictest.cpp $(TEST_DRAWING_ODEP)
- $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/basictest.cpp
-
-test_drawing_fonttest.o: $(srcdir)/drawing/fonttest.cpp $(TEST_DRAWING_ODEP)
- $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/fonttest.cpp
-
test_gui_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_GUI_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define TEST_HAS_IPC_SERVER
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_6) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --define TEST_HAS_IPC_SERVER

test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp
@@ -1278,7 +1232,7 @@ test_gui_xrctest.o: $(srcdir)/xml/xrctest.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/xml/xrctest.cpp

test_allheaders_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_ALLHEADERS_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_6) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

test_allheaders_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_ALLHEADERS_ODEP)
$(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/asserthelper.cpp


=====================================
tests/drawing/basictest.cpp deleted
=====================================
@@ -1,46 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name: tests/drawing/basictest.cpp
-// Purpose: Basic tests for wxGraphicsContext
-// Author: Armel Asselin
-// Created: 2014-02-28
-// Copyright: (c) 2014 Ellié Computing <opens...@elliecomputing.com>
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "testprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/app.h"
- #include "wx/font.h"
-// #include "wx/window.h"
-#endif // WX_PRECOMP
-
-#define _WX_CURSOR_H_BASE_
-
-
-#include "drawing.h"
-
-#if wxUSE_TEST_GC_DRAWING
-
-const GraphicsContextDrawingTestCase::DrawingTestCase
-GraphicsContextDrawingTestCase::ms_drawingBasicTc = {
- 1, &GraphicsContextDrawingTestCase::DoBasicDrawings, 800, 600, 72., true
-};
-
-void GraphicsContextDrawingTestCase::DoBasicDrawings (wxGraphicsContext *gc)
-{
- // this test is expected to be portable, on any platform, in order to keep
- // that property, it should contain only axis aligned/integer drawings so
- // that the anti-aliasing method does not cause troubles.
-
- wxGraphicsBrush gbBackground =
- gc->CreateBrush (wxBrush (wxColour (255, 255, 255)));
-
- gc->SetBrush (gbBackground);
- gc->DrawRectangle (0, 0, 800, 600);
-}
-
-#endif // wxUSE_TEST_GC_DRAWING


=====================================
tests/drawing/drawing.cpp deleted
=====================================
@@ -1,308 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name: tests/graphics/drawing.cpp
-// Purpose: Tests for wxGraphicsContent general drawing
-// Author: Armel Asselin
-// Created: 2014-02-21
-// Copyright: (c) 2014 Ellié Computing <opens...@elliecomputing.com>
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "testprec.h"
-
-#include "drawing.h"
-
-#if wxUSE_TEST_GC_DRAWING
-
-#include "wx/image.h"
-#include "wx/wfstream.h"
-#include "wx/stdpaths.h"
-#include "wx/scopeguard.h"
-
-#include "testimagefile.h"
-
-#include <stdexcept>
-
-// ----------------------------------------------------------------------------
-// test class
-// ----------------------------------------------------------------------------
-
-//// ORGANIZATION /////////////////////////////////////////////////////////////
-
-// This test suite is organized around two axes:
-// - drawing test cases
-// - drawing contexts life cycle
-// => each drawing test case represent a serie of drawing primitives to execute
-// for whichever context
-// => each drawing context life cycle represent a particular class of
-// wxGraphicsContext and a way to create, dispose of and save it so that it is
-// possible to compare it with a reference file
-
-// The crossing of drawing case and life cycles is implemented by
-// RunIndividualDrawingCase
-
-// The test case class presents a test per drawing case per life cycle so that
-// it is easy to run a particular test
-
-// The test requires reference files and must produce them when an
-// implementation changed and new good references are known to be produced.
-// Environment variables control where reference files are located and when to
-// produce them:
-// - WX_TEST_SUITE_BUILD_REFERENCE must be "1" to request production of
-// reference files (by default only testing is done)
-// - WX_TEST_SUITE_REFERENCE_DIR must be a path to a directory containing the
-// sub-directory "gcdrawing-references" (by default the parent directory
-// of the directory of the test program is used)
-
-//// WRITING NEW TEST CASES
-
-// - add a new function to realize the drawing in the "cases functions" section
-// - add a case structure declaration for it in the "test cases" section
-// - use drawingbasic.cpp as a sample to add your own test case implementation
-
-//// WRITING NEW FACTORIES
-
-// - if the wxGraphicsContext is a class built-in wxWidgets, add a
-// DrawingTestGCFactory derived sub-class in drawing.h header
-// together with a declaration for it and its implementation
-// can be placed in drawing.cpp
-// Once this is done duplicate all the test functions and entries
-// "DrawToImage_YYY" to your new GC "DrawTo<newGc>_YYYY"
-//
-
-wxString GraphicsContextDrawingTestCase::ms_referenceDirectory;
-bool GraphicsContextDrawingTestCase::ms_buildReference;
-bool GraphicsContextDrawingTestCase::ms_buildReferenceDetermined;
-GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle
- GraphicsContextDrawingTestCase::ms_imageLifeCycle;
-
-#if wxUSE_SVG
- GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle
- GraphicsContextDrawingTestCase::ms_svgLifeCycle;
-#endif // wxUSE_SVG
-
-// ----------------------------------------------------------------------------
-// tests themselves
-// ----------------------------------------------------------------------------
-
-#define wxGC_DRAWING_TEST_CASE(name) \
- wxTEST_CASE_FOR_METHOD(GraphicsContextDrawingTestCase, \
- "GraphicsContextDrawing", name, "[gcdrawing]")
-
-wxGC_DRAWING_TEST_CASE(DrawToImage_Basics)
-#if wxUSE_SVG
-//wxGC_DRAWING_TEST_CASE(DrawToSVG_Basics)
-#endif
-
-// FIXME: Reference data files are currently not found when using Unix build
-// system, so these tests are failing there, fix this and remove this ifdef.
-#ifdef __WINDOWS__
-wxGC_DRAWING_TEST_CASE(DrawToImage_Fonts)
-#if wxUSE_SVG
-//wxGC_DRAWING_TEST_CASE(DrawToSVG_Fonts)
-#endif
-#endif // __WINDOWS__
-
-void GraphicsContextDrawingTestCase::RunIndividualDrawingCase (
- DrawingTestGCFactory& gcFactory,
- const DrawingTestCase & testCase)
-{
- wxFileName fileName, refFileName;
- wxString testsOutputDirectory = wxStandardPaths::Get().GetTempDir();
- wxString refOutputDirectory = GetTestsReferenceDirectory();
-
- wxString platformTag;
- if (!testCase.platformIndependent && !gcFactory.PlatformIndependent())
- platformTag = wxString::Format("_%s", GetPlatformTag());
-
- fileName.Assign (testsOutputDirectory,
- wxString::Format("image_test_%s%s_%d", gcFactory.GetIdForFileName(),
- platformTag, testCase.caseNumber),
- gcFactory.GetExtensionForFileName());
-
- refFileName.Assign (refOutputDirectory,
- wxString::Format("image_test_%s%s_%d_ref", gcFactory.GetIdForFileName(),
- platformTag, testCase.caseNumber),
- gcFactory.GetExtensionForFileName());
-
- {
- wxGraphicsContext *gc = nullptr;
-
- wxON_BLOCK_EXIT_OBJ1(gcFactory, DrawingTestGCFactory::CleanUp, gc);
-
- gc = gcFactory.BuildNewContext(
- wxSize(testCase.width, testCase.height),
- testCase.pointsPerInch, fileName);
-
- (this->*testCase.m_drawingF)(gc);
-
- gcFactory.SaveBuiltContext(gc);
- }
-
- if (GetBuildReference())
- {
- WX_ASSERT_MESSAGE(
- ("Cannot copy file \"%s\" to \"%s\".",
- fileName.GetFullPath(), refFileName.GetFullPath()),
- wxCopyFile (fileName.GetFullPath(),
- refFileName.GetFullPath(), true));
- }
- else if (gcFactory.UseImageComparison())
- {
- if (!refFileName.FileExists())
- {
- WARN("Skipping comparison with missing reference file \""
- << refFileName.GetFullPath() << "\"");
- return;
- }
-
- WX_ASSERT_SAME_AS_IMAGE_FILE(fileName.GetFullPath(),
- refFileName.GetFullPath());
- }
- else
- {
- if (!refFileName.FileExists())
- {
- WARN("Skipping comparison with missing reference file \""
- << refFileName.GetFullPath() << "\"");
- return;
- }
-
- WX_ASSERT_SAME_AS_FILE(fileName.GetFullPath(),
- refFileName.GetFullPath());
- }
-}
-
-
-bool GraphicsContextDrawingTestCase::GetBuildReference() const
-{
- if (!ms_buildReferenceDetermined)
- {
- wxString value;
- if (wxGetEnv("WX_TEST_SUITE_BUILD_REFERENCE", &value))
- ms_buildReference = value == "1";
- }
- return ms_buildReference;
-}
-
-wxString GraphicsContextDrawingTestCase::GetTestsReferenceDirectory() const
-{
- if (ms_referenceDirectory.empty())
- {
- wxFileName refDir;
-
- if ( !wxGetEnv("WX_TEST_SUITE_REFERENCE_DIR",
- &ms_referenceDirectory) )
- {
- refDir = wxFileName(wxStandardPaths::Get().GetExecutablePath());
- refDir.SetFullName(wxString());
- refDir.AppendDir("drawing");
- refDir.AppendDir("references");
-
- if (!refDir.DirExists())
- {
- refDir = wxFileName(wxStandardPaths::Get().GetExecutablePath());
- refDir.RemoveLastDir();
- }
- }
- else
- {
- refDir = wxFileName(ms_referenceDirectory, wxT(""));
- }
-
- // The full path can end with a separator, so check the path component.
- if (refDir.GetDirs().empty() ||
- refDir.GetDirs().Last().CmpNoCase("references") != 0)
- {
- refDir.AppendDir("drawing");
- refDir.AppendDir("references");
- }
-
- ms_referenceDirectory = refDir.GetPath();
- }
- return ms_referenceDirectory;
-}
-
-wxString GraphicsContextDrawingTestCase::GetPlatformTag() const
-{
- // We consider that the platform tag is the kind of default renderer plus
- // its major/minor versions.
- // The reason why including major/minor version is important, is that the
- // rendering engine typically evolves somewhat between two version
- // (i.e. font rendering is not the same in Windows XP and Windows 8)
- int major, minor;
- const wxGraphicsRenderer *defaultRenderer = wxGraphicsRenderer::GetDefaultRenderer();
- wxString rendererName = defaultRenderer->GetName();
- defaultRenderer->GetVersion (&major, &minor);
-
- return wxString::Format("%s-%d.%d", rendererName, major, minor);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// BUILT-IN FACTORIES ////////////////////////////////////////////////////////
-
-wxGraphicsContext *
-GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle::
- BuildNewContext (wxSize expectedSize, double WXUNUSED(pointsPerInch),
- const wxFileName &targetFileName)
-{
- m_image = new wxImage (expectedSize);
- m_image->InitAlpha();
-
- m_targetFileName = targetFileName.GetFullPath();
-
- // we should probably pass the number of points per inches somewhere...
- // but I don't see where yet...
- return wxGraphicsContext::Create(*m_image);
-}
-
-void
-GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle::
- SaveBuiltContext (wxGraphicsContext *&gc)
-{
- wxDELETE(gc);
-
- m_image->SaveFile (m_targetFileName);
-}
-
-void
-GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle::
- CleanUp (wxGraphicsContext *gc)
-{
- delete gc;
- m_targetFileName.clear();
- wxDELETE(m_image);
-}
-
-#if wxUSE_SVG
-wxGraphicsContext *
-GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle::
- BuildNewContext (wxSize WXUNUSED(expectedSize),
- double WXUNUSED(pointsPerInch),
- const wxFileName &WXUNUSED(targetFileName))
-{
- m_svgFileDc = nullptr;
- //m_svg_file_dc = new wxSVGFileDC (target_file_name.GetFullPath(),
- // expected_size.GetWidth(), expected_size.GetHeight(), points_per_inch);
-
- // unfortunately cannot make GC over a DC yet :(
- throw std::runtime_error("SVG as no wxGC interface yet");
-}
-
-void
-GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle::
- SaveBuiltContext (wxGraphicsContext *&WXUNUSED(gc))
-{
-}
-
-void
-GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle::
- CleanUp (wxGraphicsContext *WXUNUSED(gc))
-{
- wxDELETE (m_svgFileDc);
-}
-#endif // wxUSE_SVG
-
-#endif // wxUSE_TEST_GC_DRAWING


=====================================
tests/drawing/drawing.h deleted
=====================================
@@ -1,159 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name: tests/drawing/drawing.h
-// Purpose: Drawing test case header
-// Author: Armel Asselin
-// Created: 2014-02-26
-// Copyright: (c) 2014 Ellié Computing <opens...@elliecomputing.com>
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TESTS_DRAWING_H_
-#define _WX_TESTS_DRAWING_H_
-
-// wxCairoRenderer::CreateMeasuringContext() is not implemented for wxX11
-#if wxUSE_GRAPHICS_CONTEXT && !defined(__WXX11__)
- #define wxUSE_TEST_GC_DRAWING 1
-#else
- #define wxUSE_TEST_GC_DRAWING 0
-#endif
-
-#if wxUSE_TEST_GC_DRAWING
-
-#include "wx/filename.h"
-#include "wx/graphics.h"
-#include "wx/math.h"
-
-#if wxUSE_SVG
-#include "wx/dcsvg.h"
-#endif
-
-// Implement a class derived from this one to let the drawing test create
-// graphics context, save them and destroy them.
-class DrawingTestGCFactory
-{
-public:
- virtual ~DrawingTestGCFactory() {}
-
- virtual wxString GetIdForFileName () const = 0;
- virtual wxString GetExtensionForFileName () const = 0;
- virtual bool UseImageComparison() const = 0;
- virtual bool PlatformIndependent() const = 0;
- virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
- double pointsPerInch, const wxFileName &targetFileName) = 0;
- virtual void SaveBuiltContext (wxGraphicsContext *&gc) = 0;
- virtual void CleanUp (wxGraphicsContext *gc) = 0;
-};
-
-class GraphicsContextDrawingTestCase
-{
-public:
- GraphicsContextDrawingTestCase()
- {
- wxImage::AddHandler (new wxPNGHandler());
- wxImage::AddHandler (new wxBMPHandler());
- }
- ~GraphicsContextDrawingTestCase() {
- ms_referenceDirectory.clear();
- }
-
-protected:
-
- // NB: individual test cases launchers are copied/pasted so that a
- // particular test case can be run alone easily
-
- class ImageGraphicsContextLifeCycle: public DrawingTestGCFactory
- {
- public:
- virtual ~ImageGraphicsContextLifeCycle() {}
- virtual wxString GetIdForFileName () const override { return "image"; }
- virtual wxString GetExtensionForFileName () const override { return "png"; }
- virtual bool UseImageComparison() const override { return true; }
- virtual bool PlatformIndependent() const override { return false; }
- virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
- double pointsPerInch, const wxFileName &targetFileName) override;
- virtual void SaveBuiltContext (wxGraphicsContext *&gc) override;
- virtual void CleanUp (wxGraphicsContext *gc) override;
- private:
- wxImage *m_image;
- wxString m_targetFileName;
- };
-
- static ImageGraphicsContextLifeCycle ms_imageLifeCycle;
-
-#if wxUSE_SVG
- class SvgGraphicsContextLifeCycle: public DrawingTestGCFactory
- {
- public:
- virtual wxString GetIdForFileName () const override { return "svg"; }
- virtual wxString GetExtensionForFileName () const override { return "svg"; }
- virtual bool UseImageComparison() const override { return false; }
- virtual bool PlatformIndependent() const override { return true; }
- virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
- double pointsPerInch, const wxFileName &targetFileName) override;
- virtual void SaveBuiltContext (wxGraphicsContext *&gc) override;
- virtual void CleanUp (wxGraphicsContext *gc) override;
-
- private:
- wxSVGFileDC *m_svgFileDc;
- };
-
- static SvgGraphicsContextLifeCycle ms_svgLifeCycle;
-#endif // wxUSE_SVG
-
- struct DrawingTestCase {
- unsigned caseNumber;
- void (GraphicsContextDrawingTestCase::*m_drawingF) (
- wxGraphicsContext *gc);
- unsigned width, height;
- double pointsPerInch;
-
- // if true, it means that this test case is "simple" enough to be
- // platform independent even for targets that normally are dependent
- // on the platform
- bool platformIndependent;
- };
-
- // test cases
- static const DrawingTestCase ms_drawingBasicTc;
- static const DrawingTestCase ms_drawingFontTc;
-
- // cases functions
- void DoBasicDrawings (wxGraphicsContext *gc);
- void DoFontDrawings (wxGraphicsContext *gc);
-
- void RunIndividualDrawingCase (
- DrawingTestGCFactory& gcFactory,
- const DrawingTestCase & testCase);
-
- void DrawToImage_Basics() {
- RunIndividualDrawingCase (ms_imageLifeCycle, ms_drawingBasicTc);
- }
-#if wxUSE_SVG
- void DrawToSVG_Basics() {
- RunIndividualDrawingCase (ms_svgLifeCycle, ms_drawingBasicTc);
- }
-#endif
- void DrawToImage_Fonts() {
- RunIndividualDrawingCase (ms_imageLifeCycle, ms_drawingFontTc);
- }
-#if wxUSE_SVG
- void DrawToSVG_Fonts() {
- RunIndividualDrawingCase (ms_svgLifeCycle, ms_drawingFontTc);
- }
-#endif
-
- bool GetBuildReference() const;
-
- wxString GetTestsReferenceDirectory() const;
-
- wxString GetPlatformTag() const;
-
- static wxString ms_referenceDirectory;
- static bool ms_buildReference, ms_buildReferenceDetermined;
-
- wxDECLARE_NO_COPY_CLASS(GraphicsContextDrawingTestCase);
-};
-
-
-#endif // wxUSE_TEST_GC_DRAWING
-
-#endif // _WX_TESTS_DRAWING_H_


=====================================
tests/drawing/fonttest.cpp deleted
=====================================
@@ -1,114 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name: tests/drawing/basictest.cpp
-// Purpose: Basic tests for wxGraphicsContext
-// Author: Armel Asselin
-// Created: 2014-02-28
-// Copyright: (c) 2014 Ellié Computing <opens...@elliecomputing.com>
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "testprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/app.h"
- #include "wx/font.h"
-#endif // WX_PRECOMP
-
-#include "drawing.h"
-
-#ifdef __WXGTK__
-#include "glib-object.h"
-#endif
-
-#if wxUSE_TEST_GC_DRAWING
-
-const GraphicsContextDrawingTestCase::DrawingTestCase
-GraphicsContextDrawingTestCase::ms_drawingFontTc = {
- 2, &GraphicsContextDrawingTestCase::DoFontDrawings, 800, 600, 72., false
-};
-
-void GraphicsContextDrawingTestCase::DoFontDrawings (wxGraphicsContext *gc)
-{
-#ifdef __WXGTK__
- wxGCC_WARNING_SUPPRESS(deprecated-declarations)
- g_type_init();
- wxGCC_WARNING_RESTORE()
-#endif
-
- // This test is expected to treat about fonts/texts. Fonts are a bit special
- // because we cannot expect the same rendering by several engines, and the
- // dimensions of the same text in same font will vary.
-
- wxGraphicsBrush gbBackground =
- gc->CreateBrush( wxBrush ( wxColour ( 240, 240, 240 ) ) );
-
- gc->SetBrush( gbBackground );
- gc->DrawRectangle(0, 0, 800, 600);
-
- wxGraphicsBrush gbTextBackground =
- gc->CreateBrush( wxBrush ( wxColour ( 192, 192, 192 ) ) );
-
- // set underlined font for testing
- gc->SetFont( wxFont(wxFontInfo(12).Family(wxFONTFAMILY_MODERN).Underlined()), *wxBLACK );
- gc->DrawText( wxT("This is text"), 110, 10, gbTextBackground );
- gc->DrawText( wxT("That is text"), 20, 10, wxDegToRad(-45), gbTextBackground );
-
- // use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated
- // (it is not TrueType)
- gc->SetFont( wxFont(wxFontInfo(12).Family(wxFONTFAMILY_SWISS)), *wxBLACK );
-
- wxString text;
-
- for ( int n = -180; n < 180; n += 30 )
- {
- text.Printf(wxT(" %d rotated text"), n);
- gc->DrawText(text , 400, 400, wxDegToRad(n) );
- }
-
- wxFont swissDcFont( wxFontInfo(18).Family(wxFONTFAMILY_SWISS) );
- wxGraphicsFont swissFont = gc->CreateFont( swissDcFont, *wxBLACK );
- gc->SetFont( swissFont );
-
- gc->DrawText( wxT("This is Swiss 18pt text."), 110, 40 );
-
- wxDouble length;
- wxDouble height;
- wxDouble descent;
- gc->GetTextExtent( wxT("This is Swiss 18pt text."), &length, &height, &descent );
- text.Printf( wxT("Dimensions are length %f, height %f, descent %f"), length, height, descent );
- gc->DrawText( text, 110, 80 );
-
- // (did not find equivalent to CharHeight())
-
- gc->SetBrush( *wxWHITE_BRUSH );
-
- gc->DrawRectangle( 100, 40, 4, height );
-
- // test the logical function effect
- wxCoord y = 150;
- // text drawing should ignore logical function
- gc->DrawText( wxT("There should be a text below"), 110, 150 );
- gc->DrawRectangle( 110, y, 100, height );
-
- y += height;
- gc->DrawText( wxT("Visible text"), 110, y );
- gc->DrawRectangle( 110, y, 100, height );
- gc->DrawText( wxT("Visible text"), 110, y );
- gc->DrawRectangle( 110, y, 100, height );
-
- y += height;
- gc->DrawRectangle( 110, y, 100, height );
- gc->DrawText( wxT("Another visible text"), 110, y );
-
- y += height;
- gc->DrawText("And\nmore\ntext on\nmultiple\nlines", 110, y);
- y += 5*height;
-
- gc->SetFont( swissDcFont, *wxBLUE );
- gc->DrawText( "Rotated text\ncan have\nmultiple lines\nas well", 110, y, wxDegToRad(15) );
-}
-
-#endif // wxUSE_TEST_GC_DRAWING


=====================================
tests/drawing/readme.txt deleted
=====================================
@@ -1,4 +0,0 @@
-Drawing Test
-############
-
-If you need directions, please read the top of drawing.cpp file, and the test.bkl file with the comments about test_drawing and test_drawingplugin items.


=====================================
tests/drawing/references/image_test_image_cairo-1.8_2_ref.png deleted
=====================================
Binary files a/tests/drawing/references/image_test_image_cairo-1.8_2_ref.png and /dev/null differ


=====================================
tests/drawing/references/image_test_image_cg-10.5_2_ref.png deleted
=====================================
Binary files a/tests/drawing/references/image_test_image_cg-10.5_2_ref.png and /dev/null differ


=====================================
tests/drawing/references/image_test_image_gdiplus-6.1_2_ref.png deleted
=====================================
Binary files a/tests/drawing/references/image_test_image_gdiplus-6.1_2_ref.png and /dev/null differ


=====================================
tests/drawing/references/readme.txt deleted
=====================================
@@ -1 +0,0 @@
-This directory is expected to contain reference files and images produced by graphics/drawing.cpp test.


=====================================
tests/drawing/testimagefile.h deleted
=====================================
@@ -1,97 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name: tests/drawing/testimagefile.h
-// Purpose: Functions to test whether the content of files or images files
-// are equal
-// Author: Armel Asselin
-// Created: 2014-02-28
-// Copyright: (c) 2014 Ellié Computing <opens...@elliecomputing.com>
-///////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef _WX_TESTS_TESTIMAGEFILE_H_
-#define _WX_TESTS_TESTIMAGEFILE_H_
-
-bool AreFilesContentsEqual(const wxString &filename, const wxString &refFilename)
-{
- wxFileInputStream input(filename);
- wxFileInputStream refInput(refFilename);
-
- wxFileOffset refLength = refInput.GetLength();
- if (refLength != input.GetLength())
- return false;
-
- wxUint8 buffer[1024], refBuffer[sizeof(buffer)];
-
- wxFileOffset remainingLength = refLength;
- while (remainingLength != 0)
- {
- input.Read (buffer, wxMin(remainingLength, sizeof(buffer)));
- refInput.Read(refBuffer, wxMin(remainingLength, sizeof(refBuffer)));
-
- size_t refLastRead = refInput.LastRead();
- if (input.LastRead() != refLastRead)
- return false;
-
- if (memcmp (buffer, refBuffer, refLastRead) != 0)
- return false;
-
- remainingLength -= refLastRead;
- }
-
- return true;
-}
-
-#define WX_ASSERT_SAME_AS_FILE(filename1, filename2) \
- WX_ASSERT_MESSAGE(\
- ("Files \"%s\" and \"%s\" differ.",\
- filename1, filename2),\
- AreFilesContentsEqual(filename1, filename2))
-
-bool AreImagesFilesContentsEqual(const wxString &filename,
- const wxString &refFilename)
-{
- wxImage input(filename);
- wxImage refInput(refFilename);
-
- // assertion_traits<wxImage> could do part of the job or maybe the contrary
- // there should probably be somethin common at least
-
- if (!input.Ok() || !refInput.Ok())
- return false;
- if (input.GetSize() != refInput.GetSize())
- return false;
- if (input.HasAlpha() != refInput.HasAlpha())
- return false;
- if (input.HasMask() != refInput.HasMask())
- return false;
-
- long pixelsCount = input.GetSize().GetWidth() * input.GetSize().GetHeight();
- const unsigned char *data = input.GetData();
- const unsigned char *refData = refInput.GetData();
- if (memcmp (data, refData, pixelsCount*3) != 0)
- return false;
-
- if (input.HasAlpha())
- {
- const unsigned char *alpha = input.GetAlpha();
- const unsigned char *refAlpha = refInput.GetAlpha();
- if (memcmp (alpha, refAlpha, pixelsCount) != 0)
- return false;
- }
-
- if (input.HasMask() &&
- (input.GetMaskRed() != refInput.GetMaskRed() ||
- input.GetMaskGreen() != refInput.GetMaskGreen() ||
- input.GetMaskBlue() != refInput.GetMaskBlue()))
- return false;
-
- return true;
-}
-
-#define WX_ASSERT_SAME_AS_IMAGE_FILE(filename1, filename2) \
- WX_ASSERT_MESSAGE(\
- ("Image files \"%s\" and \"%s\" differ.",\
- filename1, filename2),\
- AreImagesFilesContentsEqual(filename1, filename2))
-
-#endif // _WX_TESTS_TESTIMAGEFILE_H_


=====================================
tests/fswatcher/fswatchertest.cpp
=====================================
@@ -925,4 +925,92 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase,
tester.Run();
}

+// ----------------------------------------------------------------------------
+// TestEventsAfterDeletingWatchedDir
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+// Watches two directories, deletes one of them and checks that the events for the other one are
+// still received.
+class DeletedDirTester : public wxEvtHandler
+{
+public:
+ DeletedDirTester() : m_timeout(this)
+ {
+ Bind(wxEVT_FSWATCHER, &DeletedDirTester::OnFileSystemEvent, this);
+ Bind(wxEVT_TIMER, &DeletedDirTester::OnTimeout, this);
+
+ // wxFileSystemWatcher can be created only once the event loop is running.
+ CallAfter(&DeletedDirTester::DoTest);
+ }
+
+ void Run() { m_loop.Run(); }
+
+ bool GotEventForKeptDir() const { return m_gotEvent; }
+
+private:
+ void DoTest()
+ {
+ const wxFileName& base = EventGenerator::Get().GetWatchDir();
+
+ wxFileName deletedDir;
+ deletedDir.AssignDir(base.GetFullPath());
+ deletedDir.AppendDir("deleted");
+ REQUIRE( deletedDir.Mkdir() );
+
+ wxFileName keptDir;
+ keptDir.AssignDir(base.GetFullPath());
+ keptDir.AppendDir("kept");
+ REQUIRE( keptDir.Mkdir() );
+
+ m_watcher.reset(new wxFileSystemWatcher());
+ m_watcher->SetOwner(this);
+ REQUIRE( m_watcher->Add(deletedDir) );
+ REQUIRE( m_watcher->Add(keptDir) );
+
+ REQUIRE( deletedDir.Rmdir() );
+ wxMilliSleep(200);
+
+ m_file = wxFileName(keptDir.GetFullPath(), "test.txt");
+ wxFile file(m_file.GetFullPath(), wxFile::write);
+ REQUIRE( file.IsOpened() );
+
+ // Don't wait forever if the event is never received.
+ m_timeout.Start(3000, wxTIMER_ONE_SHOT);
+ }
+
+ void OnFileSystemEvent(wxFileSystemWatcherEvent& evt)
+ {
+ if ( evt.GetPath() == m_file )
+ {
+ m_gotEvent = true;
+ m_loop.Exit();
+ }
+ }
+
+ void OnTimeout(wxTimerEvent& WXUNUSED(evt))
+ {
+ m_loop.Exit();
+ }
+
+ wxEventLoop m_loop;
+ wxTimer m_timeout;
+ std::unique_ptr<wxFileSystemWatcher> m_watcher;
+ wxFileName m_file;
+ bool m_gotEvent = false;
+};
+
+} // anonymous namespace
+
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+ "wxFileSystemWatcher::EventsAfterDeletingWatchedDir", "[fsw]")
+{
+ DeletedDirTester tester;
+ tester.Run();
+
+ CHECK( tester.GotEventForKeptDir() );
+}
+
#endif // wxUSE_FSWATCHER


=====================================
tests/makefile.gcc
=====================================
@@ -117,20 +117,6 @@ TEST_OBJECTS = \
$(OBJS)\test_weakref.o \
$(OBJS)\test_xlocale.o \
$(OBJS)\test_xmltest.o
-TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
- $(__DLLFLAG_p) -DwxUSE_GUI=0 -I.\..\3rdparty\catch\single_include \
- $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-TEST_DRAWING_OBJECTS = \
- $(OBJS)\test_drawing_test_rc.o \
- $(OBJS)\test_drawing_dummy.o \
- $(OBJS)\test_drawing_test.o \
- $(OBJS)\test_drawing_drawing.o \
- $(OBJS)\test_drawing_basictest.o \
- $(OBJS)\test_drawing_fonttest.o
TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -307,14 +293,6 @@ ifeq ($(MONOLITHIC),1)
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
endif
ifeq ($(USE_GUI),1)
-__test_drawing___depname = $(OBJS)\test_drawing.exe
-endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
-endif
-endif
-ifeq ($(USE_GUI),1)
__test_gui___depname = $(OBJS)\test_gui.exe
endif
ifeq ($(MONOLITHIC),0)
@@ -345,7 +323,7 @@ __WXLIB_PROPGRID_p = \
endif
ifeq ($(MONOLITHIC),1)
ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
endif
endif
ifeq ($(USE_GUI),1)
@@ -353,7 +331,7 @@ __test_allheaders___depname = $(OBJS)\test_allheaders.exe
endif
ifeq ($(MONOLITHIC),1)
ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
endif
endif
ifeq ($(MONOLITHIC),0)
@@ -382,37 +360,37 @@ ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
endif
ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_9 = --define __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
endif
ifeq ($(DEBUG_FLAG),0)
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
endif
ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_9 = --define wxDEBUG_LEVEL=0
+__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0
endif
ifeq ($(BUILD),release)
__NDEBUG_DEFINE_p = -DNDEBUG
endif
ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_9 = --define NDEBUG
+__NDEBUG_DEFINE_p_6 = --define NDEBUG
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
endif
ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_9 = --define wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS
endif
ifeq ($(USE_RTTI),0)
__RTTI_DEFINE_p = -DwxNO_RTTI
endif
ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_9 = --define wxNO_RTTI
+__RTTI_DEFINE_p_6 = --define wxNO_RTTI
endif
ifeq ($(USE_THREADS),0)
__THREAD_DEFINE_p = -DwxNO_THREADS
endif
ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_9 = --define wxNO_THREADS
+__THREAD_DEFINE_p_6 = --define wxNO_THREADS
endif
ifeq ($(USE_CAIRO),1)
____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
@@ -424,7 +402,7 @@ ifeq ($(SHARED),1)
__DLLFLAG_p = -DWXUSINGDLL
endif
ifeq ($(SHARED),1)
-__DLLFLAG_p_9 = --define WXUSINGDLL
+__DLLFLAG_p_6 = --define WXUSINGDLL
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(USE_WEBVIEW),1)
@@ -514,13 +492,12 @@ $(OBJS):

### Targets: ###

-all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_gui___depname) $(__test_allheaders___depname) data data-image-sample data-images en_GB fr ja xart-dothraki
+all: $(OBJS)\test.exe $(__test_gui___depname) $(__test_allheaders___depname) data data-image-sample data-images en_GB fr ja xart-dothraki

clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
- -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
-if exist $(OBJS)\test_allheaders.exe del $(OBJS)\test_allheaders.exe

@@ -530,19 +507,11 @@ $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp

-ifeq ($(USE_GUI),1)
-$(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS) $(OBJS)\test_drawing_test_rc.o
- $(foreach f,$(subst \,/,$(TEST_DRAWING_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
- @move /y $@.rsp.tmp $@.rsp >nul
- $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
- @-del $@.rsp
-endif
-
ifeq ($(USE_GUI),1)
$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_test_rc.o
$(foreach f,$(subst \,/,$(TEST_GUI_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
- $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+ $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
endif

@@ -550,7 +519,7 @@ ifeq ($(USE_GUI),1)
$(OBJS)\test_allheaders.exe: $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_test_rc.o
$(foreach f,$(subst \,/,$(TEST_ALLHEADERS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
- $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+ $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
@-del $@.rsp
endif

@@ -586,7 +555,7 @@ $(OBJS)\test_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

$(OBJS)\test_test_rc.o: ./../tests/test.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include --define TEST_HAS_IPC_SERVER
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_6) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include --define TEST_HAS_IPC_SERVER

$(OBJS)\test_test.o: ./test.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
@@ -849,29 +818,11 @@ $(OBJS)\test_xlocale.o: ./xlocale/xlocale.cpp
$(OBJS)\test_xmltest.o: ./xml/xmltest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

-$(OBJS)\test_drawing_test_rc.o: ./../tests/test.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include
-
-$(OBJS)\test_drawing_dummy.o: ./dummy.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_test.o: ./test.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_drawing.o: ./drawing/drawing.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_basictest.o: ./drawing/basictest.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_drawing_fonttest.o: ./drawing/fonttest.cpp
- $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\test_gui_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<

$(OBJS)\test_gui_test_rc.o: ./../tests/test.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include --define TEST_HAS_IPC_SERVER
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_6) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include --define TEST_HAS_IPC_SERVER

$(OBJS)\test_gui_asserthelper.o: ./asserthelper.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
@@ -1219,7 +1170,7 @@ $(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<

$(OBJS)\test_allheaders_test_rc.o: ./../tests/test.rc
- $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include
+ $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_6) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include

$(OBJS)\test_allheaders_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(CPPDEPS) $<


=====================================
tests/makefile.vc
=====================================
@@ -121,26 +121,6 @@ TEST_OBJECTS = \
$(OBJS)\test_xmltest.obj
TEST_RESOURCES = \
$(OBJS)\test_test.res
-TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\test_drawing.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
- /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
- $(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \
- $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 \
- /I.\..\3rdparty\catch\single_include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" $(CPPFLAGS) \
- $(CXXFLAGS)
-TEST_DRAWING_OBJECTS = \
- $(OBJS)\test_drawing_dummy.obj \
- $(OBJS)\test_drawing_test.obj \
- $(OBJS)\test_drawing_drawing.obj \
- $(OBJS)\test_drawing_basictest.obj \
- $(OBJS)\test_drawing_fonttest.obj
-TEST_DRAWING_RESOURCES = \
- $(OBJS)\test_drawing_test.res
TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_44)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
@@ -459,9 +439,6 @@ __RUNTIME_LIBS_10 = $(__THREADSFLAG)
!if "$(MONOLITHIC)" == "1"
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
!endif
-!if "$(USE_GUI)" == "1"
-__test_drawing___depname = $(OBJS)\test_drawing.exe
-!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
!endif
@@ -798,7 +775,7 @@ $(OBJS):

### Targets: ###

-all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_gui___depname) $(__test_allheaders___depname) data data-image-sample data-images en_GB fr ja xart-dothraki
+all: $(OBJS)\test.exe $(__test_gui___depname) $(__test_allheaders___depname) data data-image-sample data-images en_GB fr ja xart-dothraki

clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -807,9 +784,6 @@ clean:
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
-if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
- -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe
- -if exist $(OBJS)\test_drawing.ilk del $(OBJS)\test_drawing.ilk
- -if exist $(OBJS)\test_drawing.pdb del $(OBJS)\test_drawing.pdb
-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
-if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk
-if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
@@ -822,13 +796,6 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) $(OBJS)\test_test.res
$(TEST_OBJECTS) $(TEST_RESOURCES) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
<<

-!if "$(USE_GUI)" == "1"
-$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS) $(OBJS)\test_drawing_test.res
- link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
- $(TEST_DRAWING_OBJECTS) $(TEST_DRAWING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
-<<
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_test.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_36) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
@@ -1138,24 +1105,6 @@ $(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp

-$(OBJS)\test_drawing_test.res: .\..\tests\test.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_9) $(__TARGET_CPU_COMPFLAG_p_9) /d __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_9) /d _CONSOLE /d wxUSE_GUI=0 /i .\..\samples /i .\..\3rdparty\catch\single_include .\..\tests\test.rc
-
-$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp
-
-$(OBJS)\test_drawing_test.obj: .\test.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
-
-$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
-
-$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
-
-$(OBJS)\test_drawing_fonttest.obj: .\drawing\fonttest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\fonttest.cpp
-
$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp



=====================================
tests/test.bkl
=====================================
@@ -129,28 +129,6 @@
<wx-lib>base</wx-lib>
</exe>

- <!--
- This test program is targeted to "headless GUI" tests, tests which are
- typically tied to the "core" component but that should run nicely in a
- console only program. This program should be executable from a console
- only Unix session (such as telnet or ssh) although it uses graphics
- contexts, so if you modify this project, please check that it can still
- be ran in such configuration and doesn't require an X server connection.
- -->
- <exe id="test_drawing" template="wx_sample_console,wx_test"
- template_append="wx_append"
- cond="USE_GUI=='1'">
- <sources>
- test.cpp
- drawing/drawing.cpp
- drawing/basictest.cpp
- drawing/fonttest.cpp
- </sources>
- <wx-lib>core</wx-lib>
- <wx-lib>net</wx-lib>
- <wx-lib>base</wx-lib>
- </exe>
-
<template id="stc_append">
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
<sys-lib>$(LIB_SCINTILLA)</sys-lib>



View it on GitLab: https://gitlab.com/wxwidgets/wxwidgets/-/compare/21a11df9b700b69e6b88be99fd37bcbeffb09997...dc45d2dce88cbbff83fa7a3845814a499dee53b2

--
View it on GitLab: https://gitlab.com/wxwidgets/wxwidgets/-/compare/21a11df9b700b69e6b88be99fd37bcbeffb09997...dc45d2dce88cbbff83fa7a3845814a499dee53b2
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help


Reply all
Reply to author
Forward
0 new messages