diff --git a/core/audio_box.h b/core/audio_box.h index ec3c62fdd..da31978ce 100644 --- a/core/audio_box.h +++ b/core/audio_box.h @@ -119,7 +119,7 @@ public: void SetFile(wxString file,bool FromVideo); void SetKaraokeButtons(bool join,bool split); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/audio_display.h b/core/audio_display.h index b9ec3aab8..3dcd739a7 100644 --- a/core/audio_display.h +++ b/core/audio_display.h @@ -151,7 +151,7 @@ public: void GetTimesSelection(int &start,int &end); void SetSelection(int start, int end); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/audio_karaoke.h b/core/audio_karaoke.h index 794078183..4271ac4a9 100644 --- a/core/audio_karaoke.h +++ b/core/audio_karaoke.h @@ -111,7 +111,7 @@ public: void Join(); void Split(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/audio_provider.h b/core/audio_provider.h index 26fe7b3e6..46da3e9e9 100644 --- a/core/audio_provider.h +++ b/core/audio_provider.h @@ -131,7 +131,7 @@ public: __int64 GetNumSamples(); int GetSampleRate(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/automation_gui.h b/core/automation_gui.h index 4dfc9b46b..dcb7f192b 100644 --- a/core/automation_gui.h +++ b/core/automation_gui.h @@ -72,7 +72,7 @@ public: static void EditScript(AutomationScript *script); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; enum { diff --git a/core/dialog_associations.h b/core/dialog_associations.h index 768042dfe..4d5064bfe 100644 --- a/core/dialog_associations.h +++ b/core/dialog_associations.h @@ -56,5 +56,5 @@ public: static bool CheckAssociation(wxString type); static void AssociateType(wxString type); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_colorpicker.cpp b/core/dialog_colorpicker.cpp index 00930230f..74cc0ad9e 100644 --- a/core/dialog_colorpicker.cpp +++ b/core/dialog_colorpicker.cpp @@ -78,7 +78,7 @@ BEGIN_EVENT_TABLE(ColorPickerSpectrum, wxControl) EVT_MOUSE_EVENTS(ColorPickerSpectrum::OnMouse) END_EVENT_TABLE() -DEFINE_EVENT_TYPE(wxSPECTRUM_CHANGE); +DEFINE_EVENT_TYPE(wxSPECTRUM_CHANGE) void ColorPickerSpectrum::OnPaint(wxPaintEvent &evt) { @@ -197,7 +197,7 @@ BEGIN_EVENT_TABLE(ColorPickerRecent, wxControl) EVT_LEFT_DOWN(ColorPickerRecent::OnClick) END_EVENT_TABLE() -DEFINE_EVENT_TYPE(wxRECENT_SELECT); +DEFINE_EVENT_TYPE(wxRECENT_SELECT) void ColorPickerRecent::OnClick(wxMouseEvent &evt) { @@ -264,7 +264,7 @@ BEGIN_EVENT_TABLE(ColorPickerScreenDropper, wxControl) EVT_MOUSE_EVENTS(ColorPickerScreenDropper::OnMouse) END_EVENT_TABLE() -DEFINE_EVENT_TYPE(wxDROPPER_SELECT); +DEFINE_EVENT_TYPE(wxDROPPER_SELECT) void ColorPickerScreenDropper::OnMouse(wxMouseEvent &evt) { diff --git a/core/dialog_colorpicker.h b/core/dialog_colorpicker.h index ca9c8c1c8..3b04328f3 100644 --- a/core/dialog_colorpicker.h +++ b/core/dialog_colorpicker.h @@ -70,7 +70,7 @@ public: void SetXY(int xx, int yy); void SetBackground(wxBitmap *new_background); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; DECLARE_EVENT_TYPE(wxSPECTRUM_CHANGE, -1) @@ -91,7 +91,7 @@ public: wxString StoreToString(); void AddColor(wxColour color); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; DECLARE_EVENT_TYPE(wxRECENT_SELECT, -1) @@ -109,10 +109,10 @@ private: public: ColorPickerScreenDropper(wxWindow *parent, wxWindowID id, int _resx, int _resy, int _magnification); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; -DECLARE_EVENT_TYPE(wxDROPPER_SELECT, -1); +DECLARE_EVENT_TYPE(wxDROPPER_SELECT, -1) wxColour GetColorFromUser(wxWindow *parent, wxColour original); @@ -198,7 +198,7 @@ public: void SetColor(wxColour new_color); wxColour GetColor(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -221,7 +221,7 @@ enum { SELECTOR_ASS_INPUT, SELECTOR_HTML_INPUT, SELECTOR_RECENT, - SELECTOR_DROPPER, + SELECTOR_DROPPER }; diff --git a/core/dialog_export.h b/core/dialog_export.h index 92729ea1f..ac52692e8 100644 --- a/core/dialog_export.h +++ b/core/dialog_export.h @@ -79,7 +79,7 @@ public: DialogExport(wxWindow *parent); ~DialogExport(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -92,5 +92,5 @@ enum { Button_Select_All, Button_Select_None, Filter_List_Box, - Charset_List_Box, + Charset_List_Box }; diff --git a/core/dialog_hotkeys.h b/core/dialog_hotkeys.h index 87b737d93..df25b17b5 100644 --- a/core/dialog_hotkeys.h +++ b/core/dialog_hotkeys.h @@ -68,7 +68,7 @@ private: public: DialogHotkeys(FrameMain *parent); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -83,7 +83,7 @@ private: public: CaptureKey(DialogInputHotkey *parent); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_jumpto.h b/core/dialog_jumpto.h index 8476e00b8..2214690be 100644 --- a/core/dialog_jumpto.h +++ b/core/dialog_jumpto.h @@ -86,7 +86,7 @@ private: public: DialogJumpToEvent(DialogJumpTo *control); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_progress.h b/core/dialog_progress.h index f866df594..c0950a808 100644 --- a/core/dialog_progress.h +++ b/core/dialog_progress.h @@ -59,7 +59,7 @@ public: void SetText(wxString text); void Run(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_properties.h b/core/dialog_properties.h index 3ae1fafd6..f885e75fe 100644 --- a/core/dialog_properties.h +++ b/core/dialog_properties.h @@ -76,7 +76,7 @@ public: DialogProperties(wxWindow *parent, VideoDisplay *vid); ~DialogProperties(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_search_replace.h b/core/dialog_search_replace.h index 2686f24c4..204a8162e 100644 --- a/core/dialog_search_replace.h +++ b/core/dialog_search_replace.h @@ -109,7 +109,7 @@ public: DialogSearchReplace(wxWindow *parent,bool hasReplace,wxString name); ~DialogSearchReplace(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_selection.h b/core/dialog_selection.h index dd1b5505a..6f6c73198 100644 --- a/core/dialog_selection.h +++ b/core/dialog_selection.h @@ -74,7 +74,7 @@ private: public: DialogSelection(wxWindow *parent, SubtitlesGrid *grid); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_shift_times.h b/core/dialog_shift_times.h index 35a231bbe..7272dd649 100644 --- a/core/dialog_shift_times.h +++ b/core/dialog_shift_times.h @@ -82,7 +82,7 @@ public: void OnRadioTime(wxCommandEvent &event); void OnRadioFrame(wxCommandEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_spellcheck.h b/core/dialog_spellcheck.h index 256dee589..d0d9af588 100644 --- a/core/dialog_spellcheck.h +++ b/core/dialog_spellcheck.h @@ -142,7 +142,7 @@ private: void OnListDoubleClick (wxCommandEvent &event); void OnTextChange(wxCommandEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() enum actioncodes { diff --git a/core/dialog_style_editor.h b/core/dialog_style_editor.h index 2e10ffb8e..7ec1df659 100644 --- a/core/dialog_style_editor.h +++ b/core/dialog_style_editor.h @@ -123,7 +123,7 @@ public: void Apply (bool apply,bool close); void OnSetColor (int n); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_style_manager.h b/core/dialog_style_manager.h index 34f90b425..c8d1c1fc8 100644 --- a/core/dialog_style_manager.h +++ b/core/dialog_style_manager.h @@ -105,7 +105,7 @@ public: void OnStorageDelete (wxCommandEvent &event); void OnCurrentDelete (wxCommandEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_styling_assistant.h b/core/dialog_styling_assistant.h index 01d545ebb..e494c29ff 100644 --- a/core/dialog_styling_assistant.h +++ b/core/dialog_styling_assistant.h @@ -62,7 +62,7 @@ private: public: StyleEditBox(DialogStyling *parent); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -103,7 +103,7 @@ public: void JumpToLine(int n); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_timing_processor.h b/core/dialog_timing_processor.h index ae096c789..5b2a1cb94 100644 --- a/core/dialog_timing_processor.h +++ b/core/dialog_timing_processor.h @@ -91,7 +91,7 @@ private: public: DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *grid); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/dialog_translation.h b/core/dialog_translation.h index 742433725..f3d8a09a8 100644 --- a/core/dialog_translation.h +++ b/core/dialog_translation.h @@ -84,7 +84,7 @@ public: void Play(); void OnTransBoxKey(wxKeyEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -99,7 +99,7 @@ private: public: DialogTranslationEvent(DialogTranslation *control); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/fonts_collector.h b/core/fonts_collector.h index a92bc63d3..f4c7b8bef 100644 --- a/core/fonts_collector.h +++ b/core/fonts_collector.h @@ -102,7 +102,7 @@ public: DialogFontsCollector(wxWindow *parent); ~DialogFontsCollector(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/frame_main.h b/core/frame_main.h index 9657afc7c..729d0f63b 100644 --- a/core/frame_main.h +++ b/core/frame_main.h @@ -223,7 +223,7 @@ public: void SetAccelerators(); void InitMenu(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/main.h b/core/main.h index b9dc6990d..3c2767c17 100644 --- a/core/main.h +++ b/core/main.h @@ -77,7 +77,7 @@ public: #endif //int OnRun(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/splash.h b/core/splash.h index 28e1e924d..fd097f9ea 100644 --- a/core/splash.h +++ b/core/splash.h @@ -59,7 +59,7 @@ public: void OnMouseEvent(wxMouseEvent& event); void OnTimer(wxTimerEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/static_bmp.h b/core/static_bmp.h index 27d4c96b3..0b391da89 100644 --- a/core/static_bmp.h +++ b/core/static_bmp.h @@ -52,5 +52,5 @@ private: public: BitmapControl(wxWindow *parent,wxBitmap _bmp,int style=0); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/subs_edit_box.h b/core/subs_edit_box.h index 7c4b364a8..296653108 100644 --- a/core/subs_edit_box.h +++ b/core/subs_edit_box.h @@ -62,7 +62,7 @@ public: SubsEditBox *control; SubsTextEditCtrl(wxWindow* parent, wxWindowID id, const wxString& value = _T(""), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -159,7 +159,7 @@ public: void UpdateFrameTiming(); void KeyPress(wxKeyEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; @@ -172,7 +172,7 @@ private: public: SubsEditBoxEvent(SubsEditBox *control); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/subs_grid.h b/core/subs_grid.h index cd07cda94..1bf95e4cd 100644 --- a/core/subs_grid.h +++ b/core/subs_grid.h @@ -145,7 +145,7 @@ public: void SetScrollbar (int orientation, int position, int thumbSize, int range, bool refresh); wxString GetTempWorkFile (); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/timeedit_ctrl.h b/core/timeedit_ctrl.h index 463a3de1e..f1c024165 100644 --- a/core/timeedit_ctrl.h +++ b/core/timeedit_ctrl.h @@ -66,5 +66,5 @@ public: void SetTime(int ms); void Update(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/toggle_bitmap.h b/core/toggle_bitmap.h index 492d3eb9d..9a9aff983 100644 --- a/core/toggle_bitmap.h +++ b/core/toggle_bitmap.h @@ -59,7 +59,7 @@ public: bool GetValue(); void SetValue(bool state); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/video_display.h b/core/video_display.h index 113baa7e4..ee85b607b 100644 --- a/core/video_display.h +++ b/core/video_display.h @@ -161,7 +161,7 @@ public: void PlayLine(); void Stop(); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/video_slider.h b/core/video_slider.h index 2b0770540..be126d7d5 100644 --- a/core/video_slider.h +++ b/core/video_slider.h @@ -81,7 +81,7 @@ public: int GetValue(); void SetValue(int value); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() }; diff --git a/core/video_zoom.h b/core/video_zoom.h index dee3f206f..da506faa7 100644 --- a/core/video_zoom.h +++ b/core/video_zoom.h @@ -57,7 +57,7 @@ public: VideoZoomSlider(wxWindow* parent, wxWindowID id, int value , int minValue, int maxValue, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSL_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = _T("VideoSlider")); void OnChangePosition(wxScrollEvent &event); - DECLARE_EVENT_TABLE(); + DECLARE_EVENT_TABLE() };