From 78edf14c889ec4f22136af69886ccdbb4f716080 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 25 Jul 2018 13:47:43 +0200 Subject: [PATCH] Revert "Add temporary debugging code for HTML pagination test failure" This reverts commit 0393940033976973c76bab8997112a2c7383e459 which is not needed any longer after fixing AppVeyor test failure. --- .travis.yml | 1 + appveyor.yml | 19 +++++++++++++++++++ src/html/htmprint.cpp | 2 -- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa86540a5e..790f5aca76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ matrix: branches: only: + - master - WX_3_0_BRANCH notifications: diff --git a/appveyor.yml b/appveyor.yml index 1361fa8a23..5b3d335e05 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,25 @@ environment: CONFIGURATION: DLL Release ARCH: x64 wxUSE_STL: 1 + - TOOLSET: nmake + VS: '9.0' + BUILD: release + ARCH: x86 + wxUSE_STL: 0 + - TOOLSET: nmake + VS: '14.0' + BUILD: debug + ARCH: amd64 + wxUSE_STL: 1 + - TOOLSET: mingw + wxUSE_STL: 0 + - TOOLSET: msys2 + MSYSTEM: MINGW32 + - TOOLSET: cygwin + - TOOLSET: cmake + GENERATOR: 'Visual Studio 12' + SHARED: ON + CONFIGURATION: Release clone_depth: 50 diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 4de883fc2c..ba1f31b016 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -33,7 +33,6 @@ #include "wx/wfstream.h" #include "wx/infobar.h" -#include "wx/crt.h" // default font size of normal text (HTML font size 0) for printing, in points: #define DEFAULT_PRINT_FONT_SIZE 12 @@ -160,7 +159,6 @@ int wxHtmlDCRenderer::FindNextPageBreak(int pos) const wxCHECK_MSG( posNext > pos, wxNOT_FOUND, "Bug in AdjustPagebreak()" ); } - wxPrintf("HTML-DEBUG: Next page break after %d is %d\n", pos, posNext); return posNext; }