浏览代码

Explicitly overriding loadFromClipboard and saveToClipboard.

David Piuva 1 年之前
父节点
当前提交
16007cd6f8
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      Source/windowManagers/Win32Window.cpp
  2. 2 2
      Source/windowManagers/X11Window.cpp

+ 2 - 2
Source/windowManagers/Win32Window.cpp

@@ -95,8 +95,8 @@ public:
 	void redraw(HWND& hwnd, bool locked, bool swap); // HWND is passed by argument because drawing might be called before the constructor has assigned it to this->hwnd
 	void redraw(HWND& hwnd, bool locked, bool swap); // HWND is passed by argument because drawing might be called before the constructor has assigned it to this->hwnd
 	void showCanvas() override;
 	void showCanvas() override;
 	// Clipboard		
 	// Clipboard		
-	dsr::ReadableString loadFromClipboard(double timeoutInSeconds);
-	void saveToClipboard(const dsr::ReadableString &text, double timeoutInSeconds);
+	dsr::ReadableString loadFromClipboard(double timeoutInSeconds) override;
+	void saveToClipboard(const dsr::ReadableString &text, double timeoutInSeconds) override;
 };
 };
 
 
 static LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 static LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

+ 2 - 2
Source/windowManagers/X11Window.cpp

@@ -107,8 +107,8 @@ public:
 	void listContentInClipboard();
 	void listContentInClipboard();
 	void initializeClipboard();
 	void initializeClipboard();
 	void terminateClipboard();		
 	void terminateClipboard();		
-	dsr::ReadableString loadFromClipboard(double timeoutInSeconds);
-	void saveToClipboard(const dsr::ReadableString &text, double timeoutInSeconds);
+	dsr::ReadableString loadFromClipboard(double timeoutInSeconds) override;
+	void saveToClipboard(const dsr::ReadableString &text, double timeoutInSeconds) override;
 };
 };
 
 
 void X11Window::initializeClipboard() {
 void X11Window::initializeClipboard() {