From 10464e4617d2ba47f3221bae8839e9da2fbb785b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 24 Oct 2011 20:18:16 +0000 Subject: [PATCH] Kill AegisubApp::OnMouseWheel. It breaks the mouse wheel in dialogs, and it didn't actually work at the moment and isn't really the right way to handle mouse wheel forwarding in the first place Originally committed to SVN as r5771. --- aegisub/src/main.cpp | 25 ------------------------- aegisub/src/main.h | 7 ------- 2 files changed, 32 deletions(-) diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp index 7d2380f8b..a396e8914 100644 --- a/aegisub/src/main.cpp +++ b/aegisub/src/main.cpp @@ -566,28 +566,3 @@ void AegisubApp::MacOpenFile(const wxString &filename) { } } #endif - - -/////////////// -// Event table -BEGIN_EVENT_TABLE(AegisubApp,wxApp) - EVT_MOUSEWHEEL(AegisubApp::OnMouseWheel) -END_EVENT_TABLE() - - - -/// @brief Mouse wheel moved -/// @param event -/// -void AegisubApp::OnMouseWheel(wxMouseEvent &event) { - if (event.WasProcessed()) return; - wxPoint pt; - wxWindow *target = wxFindWindowAtPointer(pt); - /*if (frame && (target == frame->audioBox->audioDisplay || target == frame->SubsGrid)) { - if (target->IsShownOnScreen()) target->GetEventHandler()->ProcessEvent(event); - else event.Skip(); - } - else event.Skip();*/ -} - - diff --git a/aegisub/src/main.h b/aegisub/src/main.h index da9f6d096..d90d1d981 100644 --- a/aegisub/src/main.h +++ b/aegisub/src/main.h @@ -96,13 +96,9 @@ namespace Automation4 { class AutoloadScriptManager; } /// /// DOCME class AegisubApp: public wxApp { -private: - /// DOCME PluginManager *plugins; - void OnMouseWheel(wxMouseEvent &event); - #ifdef _DEBUG /// stdout log emitter agi::log::EmitSTDOUT *emit_stdout; @@ -149,9 +145,6 @@ public: #else # error wxWidgets is compiled without exceptions support, Aegisub requires exceptions support in wxWidgets to run safely #endif - - //int OnRun(); - DECLARE_EVENT_TABLE() }; DECLARE_APP(AegisubApp)