mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

fix compilation under visual studio

Browse source 
Originally committed to SVN as r4695.
This commit is contained in:
Karl Blomster 2010-07-19 01:28:52 +00:00
parent cd810ae1c0
commit 9def56b61c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/preferences.cpp
View file

@ -472,9 +472,9 @@ public:
class Advanced_Interface: public OptionPage { class Advanced_Interface: public OptionPage {
public: public:
Advanced_Interface(wxTreebook *book): OptionPage(book, _("Backup"), PAGE_SUB) { Advanced_Interface(wxTreebook *book): OptionPage(book, _("Backup"), PAGE_SUB) {
wxFlexGridSizer *interface = PageSizer(_("Interface")); wxFlexGridSizer *interface_ = PageSizer(_("Interface"));
interface->Add(new wxStaticText(this, wxID_ANY, _T("TBD..")), 0, wxALL, 5); interface_->Add(new wxStaticText(this, wxID_ANY, _T("TBD..")), 0, wxALL, 5);
SetSizerAndFit(sizer); SetSizerAndFit(sizer);
} }
@ -554,7 +554,7 @@ Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"
subtitles = new Subtitles(book); subtitles = new Subtitles(book);
audio = new Audio(book); audio = new Audio(book);
video = new Video(book); video = new Video(book);
interface = new Interface(book); interface_ = new Interface(book);
interface_colours = new Interface_Colours(book); interface_colours = new Interface_Colours(book);
interface_hotkeys = new Interface_Hotkeys(book); interface_hotkeys = new Interface_Hotkeys(book);
paths = new Paths(book); paths = new Paths(book);

2
aegisub/src/preferences.h
View file

@ -55,7 +55,7 @@ class Preferences: public wxDialog {
Subtitles *subtitles; Subtitles *subtitles;
Audio *audio; Audio *audio;
Video *video; Video *video;
Interface *interface; Interface *interface_;
Interface_Colours *interface_colours; Interface_Colours *interface_colours;
Interface_Hotkeys *interface_hotkeys; Interface_Hotkeys *interface_hotkeys;
Paths *paths; Paths *paths;