ALL: Remove USE_PRINTING and implement no-op default print manager

sev- · sev- · commit a304f852cedc · 2026-02-15T14:37:26.000+01:00
WIN32-specific printing is behind --enable-system-printing configure option
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
@@ -85,7 +85,7 @@ void OSystem_Win32::init() {
 	initializeJpegLibraryForWin95();
 #endif
 
-#if defined(USE_PRINTING)
+#if defined(USE_SYSTEM_PRINTING)
 	_printingManager = createWin32PrintingManager();
 #endif
 
@@ -158,11 +158,6 @@ bool OSystem_Win32::hasFeature(Feature f) {
 		return true;
 #endif
 
-#ifdef USE_PRINTING
-	if (f == kFeaturePrinting)
-		return true;
-#endif
-
 	return OSystem_SDL::hasFeature(f);
 }
 
diff --git a/backends/printing/printman.cpp b/backends/printing/printman.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#ifdef USE_PRINTING
-
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/savefile.h"
@@ -96,6 +94,8 @@ void PrintingManager::saveAsImage(const Graphics::ManagedSurface &surf, const Co
 	delete saveFile;
 }
 
-} // End of namespace Common
+void PrintingManager::doPrint(const Graphics::ManagedSurface &surf) {
+	warning("PrintingManager::doPrint: No printing support in this backend");
+}
 
-#endif
+} // End of namespace Common
diff --git a/backends/printing/printman.h b/backends/printing/printman.h
@@ -56,7 +56,7 @@ class PrintingManager {
 	void setJobName(const Common::String &jobName) { _jobName = jobName; }
 
 protected:
-	virtual void doPrint(const Graphics::ManagedSurface &surf) = 0;
+	virtual void doPrint(const Graphics::ManagedSurface &surf);
 
 	virtual Common::StringArray listPrinterNames() const;
 
diff --git a/backends/printing/win32/win32-printman.cpp b/backends/printing/win32/win32-printman.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#ifdef USE_PRINTING
+#ifdef USE_SYSTEM_PRINTING
 #ifdef WIN32
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/common/system.cpp b/common/system.cpp
@@ -48,9 +48,7 @@ OSystem::OSystem() {
 	_eventManager = nullptr;
 	_timerManager = nullptr;
 	_savefileManager = nullptr;
-#if defined(USE_PRINTING)
 	_printingManager = nullptr;
-#endif
 #if defined(USE_TASKBAR)
 	_taskbarManager = nullptr;
 #endif
@@ -76,10 +74,8 @@ OSystem::~OSystem() {
 	delete _timerManager;
 	_timerManager = nullptr;
 
-#if defined(USE_PRINTING)
 	delete _printingManager;
 	_printingManager = nullptr;
-#endif
 
 #if defined(USE_TASKBAR)
 	delete _taskbarManager;
@@ -126,6 +122,10 @@ void OSystem::initBackend() {
 // 	if (!_fsFactory)
 // 		error("Backend failed to instantiate fs factory");
 
+	// Initialize default printing manager unless overridden by backend
+	if (!_printingManager)
+		_printingManager = new Common::PrintingManager();
+
 	_backendInitialized = true;
 }
 
diff --git a/common/system.h b/common/system.h
@@ -69,9 +69,7 @@ class TextToSpeechManager;
 #if defined(USE_SYSDIALOGS)
 class DialogManager;
 #endif
-#if defined(USE_PRINTING)
 class PrintingManager;
-#endif
 class TimerManager;
 class SeekableReadStream;
 class WriteStream;
@@ -267,14 +265,12 @@ class OSystem : Common::NonCopyable {
 	 */
 	FilesystemFactory *_fsFactory;
 
-#if defined(USE_PRINTING)
 	/**
 	 * No default value is provided for _printingManager by OSystem.
 	 *
 	 * @note _printingManager is deleted by the OSystem destructor.
 	*/
 	Common::PrintingManager *_printingManager;
-#endif
 
 	/**
 	 * Used by the DLC Manager implementation
@@ -598,11 +594,6 @@ class OSystem : Common::NonCopyable {
 		*/
 		kFeatureNoQuit,
 
-		/**
-		* Putting text and/or images on physical paper
-		*/
-		kFeaturePrinting,
-
 		/**
 		* The presence of this feature indicates that the backend uses a touchscreen.
 		*
@@ -1809,7 +1800,6 @@ class OSystem : Common::NonCopyable {
 		return _textToSpeechManager;
 	}
 
-#if defined(USE_PRINTING)
 	/**
 	 * Return the PrintingManager, used to handle printing.
 	 *
@@ -1818,7 +1808,6 @@ class OSystem : Common::NonCopyable {
 	virtual Common::PrintingManager *getPrintingManager() {
 		return _printingManager;
 	}
-#endif
 
 #if defined(USE_SYSDIALOGS)
 	/**
diff --git a/configure b/configure
@@ -1409,8 +1409,8 @@ for ac_option in $@; do
 	--disable-vkeybd)            _vkeybd=no              ;;
 	--enable-eventrecorder)      _eventrec=yes           ;;
 	--disable-eventrecorder)     _eventrec=no            ;;
-	--enable-printing)           _printing=yes           ;;
-	--disable-printing)          _printing=no            ;;
+	--enable-system-printing)    _printing=yes           ;;
+	--disable-system-printing)   _printing=no            ;;
 	--enable-text-console)       _text_console=yes       ;;
 	--disable-text-console)      _text_console=no        ;;
 	--enable-ext-sse2)           _ext_sse2=yes           ;;
@@ -7238,8 +7238,12 @@ case $_host_os in
 mingw*)
 	echo "win32"
 	append_var LIBS '-lMsimg32'
+	;;
+*)
+	echo "no"
+	;;
 esac
-define_in_config_if_yes $_printing 'USE_PRINTING'
+define_in_config_if_yes $_printing 'USE_SYSTEM_PRINTING'
 
 #
 # Check whether to build system dialogs support
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
@@ -1221,7 +1221,7 @@ const Feature s_features[] = {
 	{        "translation",               "USE_TRANSLATION", false, true,  "Translation support" },
 	{             "vkeybd",                 "ENABLE_VKEYBD", false, false, "Virtual keyboard support"},
 	{      "eventrecorder",          "ENABLE_EVENTRECORDER", false, false, "Event recorder support"},
-	{           "printing",                  "USE_PRINTING", false, true,  "Printing support"},
+	{           "printing",           "USE_SYSTEM_PRINTING", false, true,  "Printing support"},
 	{            "updates",                   "USE_UPDATES", false, false, "Updates support"},
 	{            "dialogs",                "USE_SYSDIALOGS", false, true,  "System dialogs support"},
 	{         "langdetect",                "USE_DETECTLANG", false, true,  "System language detection support" }, // This feature actually depends on "translation", there
diff --git a/engines/director/debugger/dt-score.cpp b/engines/director/debugger/dt-score.cpp
@@ -616,7 +616,7 @@ void showScore() {
 			if (ImGui::BeginCombo("##mode", selMode)) {
 				for (int n = 0; n < ARRAYSIZE(modes); n++) {
 					const bool selected = (_state->_scoreMode == n);
-					if (ImGui::Selectable(modes[n], selected))
+					if (ImGui::Selectable(Common::String::format("%s##%d", modes[n], n).c_str(), selected))
 						_state->_scoreMode = n;
 
 					if (selected)
diff --git a/engines/testbed/printing.cpp b/engines/testbed/printing.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(USE_PRINTING)
-
 #include "base/version.h"
 
 #include "common/rect.h"
@@ -82,5 +80,3 @@ TestExitStatus PrintingTests::printTestPage() {
 }
 
 } // End of namespace Testbed
-
-#endif
diff --git a/engines/testbed/printing.h b/engines/testbed/printing.h
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(USE_PRINTING)
-
 #ifndef TESTBED_PRINTING_H
 #define TESTBED_PRINTING_H
 
@@ -52,5 +50,3 @@ class PrintingTestSuite : public Testsuite {
 } // End of namespace Testbed
 
 #endif
-
-#endif
diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp
@@ -51,9 +51,7 @@
 #ifdef USE_SDL_NET
 #include "testbed/webserver.h"
 #endif
-#ifdef USE_PRINTING
 #include "testbed/printing.h"
-#endif
 #ifdef USE_TTS
 #include "testbed/speech.h"
 #endif
@@ -111,7 +109,7 @@ void TestbedExitDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, ui
 		ConfParams.setRerunFlag(true);
 		cmd = GUI::kCloseCmd;
 		break;
-	case kViewLogCmd: 
+	case kViewLogCmd:
 		Common::Path logPath = Common::Path(ConfParams.getLogDirectory());
 		GUI::TextViewerDialog viewer(logPath.appendComponent(ConfParams.getLogFilename()));
 		viewer.runModal();
@@ -175,11 +173,9 @@ void TestbedEngine::pushTestsuites(Common::Array<Testsuite *> &testsuiteList) {
 	// Networking
 	ts = new NetworkingTestSuite();
 	testsuiteList.push_back(ts);
-#ifdef USE_PRINTING
 	// Printing
 	ts = new PrintingTestSuite();
 	testsuiteList.push_back(ts);
-#endif
 #ifdef USE_TTS
 	// TextToSpeech
 	ts = new SpeechTestSuite();
diff --git a/gui/printing-dialog.cpp b/gui/printing-dialog.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(USE_PRINTING)
-
 #include "common/translation.h"
 #include "common/system.h"
 
@@ -96,5 +94,3 @@ void PrintingDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3
 }
 
 } // End of namespace GUI
-
-#endif
diff --git a/gui/printing-dialog.h b/gui/printing-dialog.h
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(USE_PRINTING)
-
 #ifndef GUI_PRINTING_DIALOGS_H
 #define GUI_PRINTING_DIALOGS_H
 
@@ -58,5 +56,3 @@ class PrintingDialog : public GUI::Dialog {
 } // End of namespace GUI
 
 #endif
-
-#endif

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`*/`
`21`	`21`
`22`		`-#ifdef USE_PRINTING`
	`22`	`+#ifdef USE_SYSTEM_PRINTING`
`23`	`23`	`#ifdef WIN32`
`24`	`24`
`25`	`25`	`#define WIN32_LEAN_AND_MEAN`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@`
`19`	`19`	`*`
`20`	`20`	`*/`
`21`	`21`
`22`		`-#if defined(USE_PRINTING)`
`23`		`-`
`24`	`22`	`#include "base/version.h"`
`25`	`23`
`26`	`24`	`#include "common/rect.h"`
`@@ -82,5 +80,3 @@ TestExitStatus PrintingTests::printTestPage() {`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`} // End of namespace Testbed`
`85`		`-`
`86`		`-#endif`