From 4dfee68dd715b3f5a9f76bb64a034e7430a21ce3 Mon Sep 17 00:00:00 2001 From: Palana Date: Wed, 1 Jan 2014 04:06:59 +0100 Subject: [PATCH] fix warnings in window-namedialog and mark methods as override --- obs/window-namedialog.cpp | 4 +--- obs/window-namedialog.hpp | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/obs/window-namedialog.cpp b/obs/window-namedialog.cpp index 8a47d700f..8e7076a1f 100644 --- a/obs/window-namedialog.cpp +++ b/obs/window-namedialog.cpp @@ -15,12 +15,10 @@ along with this program. If not, see . ******************************************************************************/ -#pragma once - #include "window-namedialog.hpp" using namespace std; -void NameDialog::OnClose(wxCommandEvent &event) +void NameDialog::OnClose(wxCloseEvent &event) { EndModal(wxID_CANCEL); } diff --git a/obs/window-namedialog.hpp b/obs/window-namedialog.hpp index 03c953c1e..152e42131 100644 --- a/obs/window-namedialog.hpp +++ b/obs/window-namedialog.hpp @@ -23,9 +23,9 @@ class NameDialog : public NameDialogBase { protected: - virtual void OnClose(wxCommandEvent &event); - virtual void OKPressed(wxCommandEvent &event); - virtual void CancelPressed(wxCommandEvent &event); + virtual void OnClose(wxCloseEvent &event) override; + virtual void OKPressed(wxCommandEvent &event) override; + virtual void CancelPressed(wxCommandEvent &event) override; public: inline NameDialog(wxWindow *parent)