mirror of https://github.com/odrling/Aegisub
remove extra semicolons and commas (strict ISO-C++98)
Originally committed to SVN as r13.
This commit is contained in:
parent
6935e56b3d
commit
2abf229414
|
@ -119,7 +119,7 @@ public:
|
||||||
void SetFile(wxString file,bool FromVideo);
|
void SetFile(wxString file,bool FromVideo);
|
||||||
void SetKaraokeButtons(bool join,bool split);
|
void SetKaraokeButtons(bool join,bool split);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,7 @@ public:
|
||||||
void GetTimesSelection(int &start,int &end);
|
void GetTimesSelection(int &start,int &end);
|
||||||
void SetSelection(int start, int end);
|
void SetSelection(int start, int end);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@ public:
|
||||||
void Join();
|
void Join();
|
||||||
void Split();
|
void Split();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ public:
|
||||||
__int64 GetNumSamples();
|
__int64 GetNumSamples();
|
||||||
int GetSampleRate();
|
int GetSampleRate();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ public:
|
||||||
|
|
||||||
static void EditScript(AutomationScript *script);
|
static void EditScript(AutomationScript *script);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -56,5 +56,5 @@ public:
|
||||||
static bool CheckAssociation(wxString type);
|
static bool CheckAssociation(wxString type);
|
||||||
static void AssociateType(wxString type);
|
static void AssociateType(wxString type);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
|
@ -78,7 +78,7 @@ BEGIN_EVENT_TABLE(ColorPickerSpectrum, wxControl)
|
||||||
EVT_MOUSE_EVENTS(ColorPickerSpectrum::OnMouse)
|
EVT_MOUSE_EVENTS(ColorPickerSpectrum::OnMouse)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
DEFINE_EVENT_TYPE(wxSPECTRUM_CHANGE);
|
DEFINE_EVENT_TYPE(wxSPECTRUM_CHANGE)
|
||||||
|
|
||||||
void ColorPickerSpectrum::OnPaint(wxPaintEvent &evt)
|
void ColorPickerSpectrum::OnPaint(wxPaintEvent &evt)
|
||||||
{
|
{
|
||||||
|
@ -197,7 +197,7 @@ BEGIN_EVENT_TABLE(ColorPickerRecent, wxControl)
|
||||||
EVT_LEFT_DOWN(ColorPickerRecent::OnClick)
|
EVT_LEFT_DOWN(ColorPickerRecent::OnClick)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
DEFINE_EVENT_TYPE(wxRECENT_SELECT);
|
DEFINE_EVENT_TYPE(wxRECENT_SELECT)
|
||||||
|
|
||||||
void ColorPickerRecent::OnClick(wxMouseEvent &evt)
|
void ColorPickerRecent::OnClick(wxMouseEvent &evt)
|
||||||
{
|
{
|
||||||
|
@ -264,7 +264,7 @@ BEGIN_EVENT_TABLE(ColorPickerScreenDropper, wxControl)
|
||||||
EVT_MOUSE_EVENTS(ColorPickerScreenDropper::OnMouse)
|
EVT_MOUSE_EVENTS(ColorPickerScreenDropper::OnMouse)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
DEFINE_EVENT_TYPE(wxDROPPER_SELECT);
|
DEFINE_EVENT_TYPE(wxDROPPER_SELECT)
|
||||||
|
|
||||||
void ColorPickerScreenDropper::OnMouse(wxMouseEvent &evt)
|
void ColorPickerScreenDropper::OnMouse(wxMouseEvent &evt)
|
||||||
{
|
{
|
||||||
|
|
|
@ -70,7 +70,7 @@ public:
|
||||||
void SetXY(int xx, int yy);
|
void SetXY(int xx, int yy);
|
||||||
void SetBackground(wxBitmap *new_background);
|
void SetBackground(wxBitmap *new_background);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_EVENT_TYPE(wxSPECTRUM_CHANGE, -1)
|
DECLARE_EVENT_TYPE(wxSPECTRUM_CHANGE, -1)
|
||||||
|
@ -91,7 +91,7 @@ public:
|
||||||
wxString StoreToString();
|
wxString StoreToString();
|
||||||
void AddColor(wxColour color);
|
void AddColor(wxColour color);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_EVENT_TYPE(wxRECENT_SELECT, -1)
|
DECLARE_EVENT_TYPE(wxRECENT_SELECT, -1)
|
||||||
|
@ -109,10 +109,10 @@ private:
|
||||||
public:
|
public:
|
||||||
ColorPickerScreenDropper(wxWindow *parent, wxWindowID id, int _resx, int _resy, int _magnification);
|
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);
|
wxColour GetColorFromUser(wxWindow *parent, wxColour original);
|
||||||
|
@ -198,7 +198,7 @@ public:
|
||||||
void SetColor(wxColour new_color);
|
void SetColor(wxColour new_color);
|
||||||
wxColour GetColor();
|
wxColour GetColor();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -221,7 +221,7 @@ enum {
|
||||||
SELECTOR_ASS_INPUT,
|
SELECTOR_ASS_INPUT,
|
||||||
SELECTOR_HTML_INPUT,
|
SELECTOR_HTML_INPUT,
|
||||||
SELECTOR_RECENT,
|
SELECTOR_RECENT,
|
||||||
SELECTOR_DROPPER,
|
SELECTOR_DROPPER
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ public:
|
||||||
DialogExport(wxWindow *parent);
|
DialogExport(wxWindow *parent);
|
||||||
~DialogExport();
|
~DialogExport();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -92,5 +92,5 @@ enum {
|
||||||
Button_Select_All,
|
Button_Select_All,
|
||||||
Button_Select_None,
|
Button_Select_None,
|
||||||
Filter_List_Box,
|
Filter_List_Box,
|
||||||
Charset_List_Box,
|
Charset_List_Box
|
||||||
};
|
};
|
||||||
|
|
|
@ -68,7 +68,7 @@ private:
|
||||||
public:
|
public:
|
||||||
DialogHotkeys(FrameMain *parent);
|
DialogHotkeys(FrameMain *parent);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ private:
|
||||||
public:
|
public:
|
||||||
CaptureKey(DialogInputHotkey *parent);
|
CaptureKey(DialogInputHotkey *parent);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DialogJumpToEvent(DialogJumpTo *control);
|
DialogJumpToEvent(DialogJumpTo *control);
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ public:
|
||||||
void SetText(wxString text);
|
void SetText(wxString text);
|
||||||
void Run();
|
void Run();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ public:
|
||||||
DialogProperties(wxWindow *parent, VideoDisplay *vid);
|
DialogProperties(wxWindow *parent, VideoDisplay *vid);
|
||||||
~DialogProperties();
|
~DialogProperties();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,7 @@ public:
|
||||||
DialogSearchReplace(wxWindow *parent,bool hasReplace,wxString name);
|
DialogSearchReplace(wxWindow *parent,bool hasReplace,wxString name);
|
||||||
~DialogSearchReplace();
|
~DialogSearchReplace();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ private:
|
||||||
public:
|
public:
|
||||||
DialogSelection(wxWindow *parent, SubtitlesGrid *grid);
|
DialogSelection(wxWindow *parent, SubtitlesGrid *grid);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ public:
|
||||||
void OnRadioTime(wxCommandEvent &event);
|
void OnRadioTime(wxCommandEvent &event);
|
||||||
void OnRadioFrame(wxCommandEvent &event);
|
void OnRadioFrame(wxCommandEvent &event);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,7 @@ private:
|
||||||
void OnListDoubleClick (wxCommandEvent &event);
|
void OnListDoubleClick (wxCommandEvent &event);
|
||||||
void OnTextChange(wxCommandEvent &event);
|
void OnTextChange(wxCommandEvent &event);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
|
|
||||||
|
|
||||||
enum actioncodes {
|
enum actioncodes {
|
||||||
|
|
|
@ -123,7 +123,7 @@ public:
|
||||||
void Apply (bool apply,bool close);
|
void Apply (bool apply,bool close);
|
||||||
void OnSetColor (int n);
|
void OnSetColor (int n);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,7 @@ public:
|
||||||
void OnStorageDelete (wxCommandEvent &event);
|
void OnStorageDelete (wxCommandEvent &event);
|
||||||
void OnCurrentDelete (wxCommandEvent &event);
|
void OnCurrentDelete (wxCommandEvent &event);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ private:
|
||||||
public:
|
public:
|
||||||
StyleEditBox(DialogStyling *parent);
|
StyleEditBox(DialogStyling *parent);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ public:
|
||||||
|
|
||||||
void JumpToLine(int n);
|
void JumpToLine(int n);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ private:
|
||||||
public:
|
public:
|
||||||
DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *grid);
|
DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *grid);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ public:
|
||||||
void Play();
|
void Play();
|
||||||
void OnTransBoxKey(wxKeyEvent &event);
|
void OnTransBoxKey(wxKeyEvent &event);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DialogTranslationEvent(DialogTranslation *control);
|
DialogTranslationEvent(DialogTranslation *control);
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -102,7 +102,7 @@ public:
|
||||||
DialogFontsCollector(wxWindow *parent);
|
DialogFontsCollector(wxWindow *parent);
|
||||||
~DialogFontsCollector();
|
~DialogFontsCollector();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -223,7 +223,7 @@ public:
|
||||||
void SetAccelerators();
|
void SetAccelerators();
|
||||||
void InitMenu();
|
void InitMenu();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ public:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//int OnRun();
|
//int OnRun();
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ public:
|
||||||
void OnMouseEvent(wxMouseEvent& event);
|
void OnMouseEvent(wxMouseEvent& event);
|
||||||
void OnTimer(wxTimerEvent &event);
|
void OnTimer(wxTimerEvent &event);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -52,5 +52,5 @@ private:
|
||||||
public:
|
public:
|
||||||
BitmapControl(wxWindow *parent,wxBitmap _bmp,int style=0);
|
BitmapControl(wxWindow *parent,wxBitmap _bmp,int style=0);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
|
@ -62,7 +62,7 @@ public:
|
||||||
SubsEditBox *control;
|
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);
|
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 UpdateFrameTiming();
|
||||||
void KeyPress(wxKeyEvent &event);
|
void KeyPress(wxKeyEvent &event);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -172,7 +172,7 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SubsEditBoxEvent(SubsEditBox *control);
|
SubsEditBoxEvent(SubsEditBox *control);
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -145,7 +145,7 @@ public:
|
||||||
void SetScrollbar (int orientation, int position, int thumbSize, int range, bool refresh);
|
void SetScrollbar (int orientation, int position, int thumbSize, int range, bool refresh);
|
||||||
wxString GetTempWorkFile ();
|
wxString GetTempWorkFile ();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -66,5 +66,5 @@ public:
|
||||||
void SetTime(int ms);
|
void SetTime(int ms);
|
||||||
void Update();
|
void Update();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
|
@ -59,7 +59,7 @@ public:
|
||||||
bool GetValue();
|
bool GetValue();
|
||||||
void SetValue(bool state);
|
void SetValue(bool state);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,7 @@ public:
|
||||||
void PlayLine();
|
void PlayLine();
|
||||||
void Stop();
|
void Stop();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ public:
|
||||||
int GetValue();
|
int GetValue();
|
||||||
void SetValue(int value);
|
void SetValue(int value);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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"));
|
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);
|
void OnChangePosition(wxScrollEvent &event);
|
||||||
DECLARE_EVENT_TABLE();
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue