diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index c3a46a56e..eecdbd7cd 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -88,11 +88,6 @@ namespace { lua_pushinteger(L, n); } - inline void push_value(lua_State *L, double n) - { - lua_pushnumber(L, n); - } - template inline void set_field(lua_State *L, const char *name, T value) { diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp index c2eada78d..e5ce4336f 100644 --- a/aegisub/src/auto4_lua_dialog.cpp +++ b/aegisub/src/auto4_lua_dialog.cpp @@ -333,7 +333,7 @@ namespace Automation4 { FloatEdit(lua_State *L) : Edit(L) - , value(get_field(L, "value", 0)) + , value(get_field(L, "value", 0.0)) { // TODO: spin button support } diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp index eddad0d79..7d116d501 100644 --- a/aegisub/src/dialog_fonts_collector.cpp +++ b/aegisub/src/dialog_fonts_collector.cpp @@ -163,7 +163,9 @@ DialogFontsCollector::DialogFontsCollector(wxWindow *parent, AssFile *ass) CenterOnParent(); // Run dummy event to update label - Update(); + wxCommandEvent evt; + evt.SetInt(-1); + OnRadio(evt); } @@ -296,15 +298,8 @@ void DialogFontsCollector::OnBrowse(wxCommandEvent &event) { /// @param event /// void DialogFontsCollector::OnRadio(wxCommandEvent &event) { - Update(event.GetInt()); -} + int value = event.GetInt(); - - -/// @brief Update controls -/// @param value -/// -void DialogFontsCollector::Update(int value) { // Enable buttons CloseButton->Enable(true); StartButton->Enable(true); diff --git a/aegisub/src/dialog_fonts_collector.h b/aegisub/src/dialog_fonts_collector.h index 79b3937f3..d86196ab5 100644 --- a/aegisub/src/dialog_fonts_collector.h +++ b/aegisub/src/dialog_fonts_collector.h @@ -138,7 +138,6 @@ class DialogFontsCollector : public wxDialog { void OnBrowse(wxCommandEvent &event); void OnRadio(wxCommandEvent &event); void OnAddText(wxCommandEvent &event); - void Update(int value=-1); public: DialogFontsCollector(wxWindow *parent, AssFile *subs); diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index 8fad30ae8..6c659422c 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -328,14 +328,14 @@ SubsEditBox::SubsEditBox(wxWindow *parent, agi::Context *context) OnSize(evt); c->selectionController->AddSelectionListener(this); - file_changed_slot = c->ass->AddCommitListener(&SubsEditBox::Update, this); + file_changed_slot = c->ass->AddCommitListener(&SubsEditBox::OnCommit, this); context->videoController->AddTimecodesListener(&SubsEditBox::UpdateFrameTiming, this); } SubsEditBox::~SubsEditBox() { c->selectionController->RemoveSelectionListener(this); } -void SubsEditBox::Update(int type) { +void SubsEditBox::OnCommit(int type) { wxEventBlocker blocker(this); if (type == AssFile::COMMIT_NEW || type & AssFile::COMMIT_STYLES) { @@ -419,7 +419,7 @@ void SubsEditBox::OnActiveLineChanged(AssDialogue *new_line) { line = new_line; commitId = -1; - Update(AssFile::COMMIT_DIAG_FULL); + OnCommit(AssFile::COMMIT_DIAG_FULL); /// @todo VideoContext should be doing this if (c->videoController->IsLoaded()) { diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h index 1893d03dc..237993941 100644 --- a/aegisub/src/subs_edit_box.h +++ b/aegisub/src/subs_edit_box.h @@ -193,7 +193,7 @@ class SubsEditBox : public wxPanel, protected SelectionListener { /// @brief Reload the current line from the file /// @param type AssFile::CommitType - void Update(int type); + void OnCommit(int type); /// Regenerate the contents of the actor dropdown list void PopulateActorList(); diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp index c3554a83f..8ee2f600b 100644 --- a/aegisub/src/subs_edit_ctrl.cpp +++ b/aegisub/src/subs_edit_ctrl.cpp @@ -233,7 +233,7 @@ enum { STYLE_KARAOKE_VARIABLE }; -void SubsTextEditCtrl::SetStyle(int id, wxFont &font, std::string const& name) { +void SubsTextEditCtrl::SetSyntaxStyle(int id, wxFont &font, std::string const& name) { StyleSetFont(id, font); StyleSetBold(id, OPT_GET("Colour/Subtitle/Syntax/Bold/" + name)->GetBool()); StyleSetForeground(id, lagi_wxColour(OPT_GET("Colour/Subtitle/Syntax/" + name)->GetColour())); @@ -249,17 +249,17 @@ void SubsTextEditCtrl::SetStyles() { if (!fontname.empty()) font.SetFaceName(fontname); font.SetPointSize(OPT_GET("Subtitle/Edit Box/Font Size")->GetInt()); - SetStyle(STYLE_NORMAL, font, "Normal"); - SetStyle(STYLE_COMMENT, font, "Comment"); - SetStyle(STYLE_DRAWING, font, "Drawing"); - SetStyle(STYLE_OVERRIDE, font, "Brackets"); - SetStyle(STYLE_PUNCTUATION, font, "Slashes"); - SetStyle(STYLE_TAG, font, "Tags"); - SetStyle(STYLE_ERROR, font, "Error"); - SetStyle(STYLE_PARAMETER, font, "Parameters"); - SetStyle(STYLE_LINE_BREAK, font, "Line Break"); - SetStyle(STYLE_KARAOKE_TEMPLATE, font, "Karaoke Template"); - SetStyle(STYLE_KARAOKE_VARIABLE, font, "Karaoke Variable"); + SetSyntaxStyle(STYLE_NORMAL, font, "Normal"); + SetSyntaxStyle(STYLE_COMMENT, font, "Comment"); + SetSyntaxStyle(STYLE_DRAWING, font, "Drawing"); + SetSyntaxStyle(STYLE_OVERRIDE, font, "Brackets"); + SetSyntaxStyle(STYLE_PUNCTUATION, font, "Slashes"); + SetSyntaxStyle(STYLE_TAG, font, "Tags"); + SetSyntaxStyle(STYLE_ERROR, font, "Error"); + SetSyntaxStyle(STYLE_PARAMETER, font, "Parameters"); + SetSyntaxStyle(STYLE_LINE_BREAK, font, "Line Break"); + SetSyntaxStyle(STYLE_KARAOKE_TEMPLATE, font, "Karaoke Template"); + SetSyntaxStyle(STYLE_KARAOKE_VARIABLE, font, "Karaoke Variable"); // Misspelling indicator IndicatorSetStyle(0,wxSTC_INDIC_SQUIGGLE); diff --git a/aegisub/src/subs_edit_ctrl.h b/aegisub/src/subs_edit_ctrl.h index df5881f0f..379294818 100644 --- a/aegisub/src/subs_edit_ctrl.h +++ b/aegisub/src/subs_edit_ctrl.h @@ -88,7 +88,7 @@ class SubsTextEditCtrl : public ScintillaTextCtrl { void OnSetThesLanguage(wxCommandEvent &event); void OnLoseFocus(wxFocusEvent &event); - void SetStyle(int id, wxFont &font, std::string const& name); + void SetSyntaxStyle(int id, wxFont &font, std::string const& name); void Subscribe(std::string const& name); void StyleSpellCheck(); diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp index 98e3c56b3..19c3cf03d 100644 --- a/aegisub/src/subs_grid.cpp +++ b/aegisub/src/subs_grid.cpp @@ -321,7 +321,7 @@ void SubtitlesGrid::DeleteLines(wxArrayInt target, bool flagModified) { } // Add default line if file was wiped - if (GetRows() == deleted) { + if ((size_t)GetRows() == deleted) { AssDialogue *def = new AssDialogue; ++before_first; context->ass->Line.insert(before_first, def); diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp index ea6bbf0ac..1fbb90c33 100644 --- a/aegisub/src/visual_tool.cpp +++ b/aegisub/src/visual_tool.cpp @@ -490,7 +490,7 @@ void VisualToolBase::GetLineRotation(AssDialogue *diag, float &rx, float &ry, fl ry = tag->front()->Get(ry); if (param_vec tag = find_tag(diag, "\\frz")) rz = tag->front()->Get(rz); - else if (tag = find_tag(diag, "\\fr")) + else if ((tag = find_tag(diag, "\\fr"))) rz = tag->front()->Get(rz); }