From 9cefad91e3292e9965f5321c467b09dfce114475 Mon Sep 17 00:00:00 2001 From: "Paul \"Dettorer\" Hervot" Date: Sun, 29 Nov 2015 08:02:48 +0100 Subject: [PATCH] Emu_window: Move virtual function definition to .cpp file (fix weak_vtable) --- src/common/emu_window.cpp | 5 +++++ src/common/emu_window.h | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp index b69b05cb9..dd42758f0 100644 --- a/src/common/emu_window.cpp +++ b/src/common/emu_window.cpp @@ -124,3 +124,8 @@ EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(u return res; } + +void EmuWindow::OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) { + // By default, ignore this request and do nothing. + (void)minimal_size; +} diff --git a/src/common/emu_window.h b/src/common/emu_window.h index a0ae4c9fa..1d82973fb 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -195,9 +195,7 @@ private: * Handler called when the minimal client area was requested to be changed via SetConfig. * For the request to be honored, EmuWindow implementations will usually reimplement this function. */ - virtual void OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) { - // By default, ignore this request and do nothing. - } + virtual void OnMinimalClientAreaChangeRequest(const std::pair& minimal_size); FramebufferLayout framebuffer_layout; ///< Current framebuffer layout