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

Make more of AegisubApp's methods private

Browse source 
Originally committed to SVN as r6049.
This commit is contained in:
Thomas Goyne 2011-12-22 21:17:12 +00:00
parent 2ec3ff157b
commit f1ff18545a
2 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/src/main.cpp
View file

@ -148,7 +148,7 @@ void SetThreadName(DWORD dwThreadID, LPCSTR szThreadName) {
#endif #endif
/// @brief Handle wx assertions and redirct to the logging system. /// @brief Handle wx assertions and redirect to the logging system.
/// @param file File name /// @param file File name
/// @param line Line number /// @param line Line number
/// @param func Function name /// @param func Function name
@ -193,9 +193,6 @@ bool AegisubApp::OnInit() {
// Init icons. // Init icons.
icon::icon_init(); icon::icon_init();
// Install assertion handler
// wxSetAssertHandler(wxAssertHandler);
const std::string conf_mru(StandardPaths::DecodePath("?user/mru.json")); const std::string conf_mru(StandardPaths::DecodePath("?user/mru.json"));
config::mru = new agi::MRUManager(conf_mru, GET_DEFAULT_CONFIG(default_mru)); config::mru = new agi::MRUManager(conf_mru, GET_DEFAULT_CONFIG(default_mru));

36
aegisub/src/main.h
View file

@ -81,7 +81,7 @@ namespace Automation4 { class AutoloadScriptManager; }
/// Macro to subscribe to OptionValue changes /// Macro to subscribe to OptionValue changes
#define OPT_SUB(x, ...) config::opt->Get(x)->Subscribe(__VA_ARGS__) #define OPT_SUB(x, ...) config::opt->Get(x)->Subscribe(__VA_ARGS__)
/// Macro to unsubscribe to OptionValue changes /// Macro to unsubscribe from OptionValue changes
#define OPT_UNSUB(x, ...) config::opt->Get(x)->Unsubscribe(__VA_ARGS__) #define OPT_UNSUB(x, ...) config::opt->Get(x)->Unsubscribe(__VA_ARGS__)
/// Macro to get a path. /// Macro to get a path.
@ -105,8 +105,20 @@ class AegisubApp: public wxApp {
agi::log::EmitSTDOUT *emit_stdout; agi::log::EmitSTDOUT *emit_stdout;
#endif #endif
public: bool OnInit();
int OnExit();
int OnRun();
#if !defined(_DEBUG) || defined(WITH_EXCEPTIONS)
void OnUnhandledException();
void OnFatalException();
#endif
// This function wraps all event handler calls anywhere in the application and is
// our ticket to catch exceptions happening in event handlers.
void HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const;
public:
/// DOCME /// DOCME
AegisubLocale locale; AegisubLocale locale;
@ -116,30 +128,12 @@ public:
/// DOCME /// DOCME
Automation4::AutoloadScriptManager *global_scripts; Automation4::AutoloadScriptManager *global_scripts;
static AegisubApp* Get() { return (AegisubApp*)wxTheApp; }
/// @brief DOCME
/// @return
///
static AegisubApp* Get() { return (AegisubApp*) wxTheApp; }
bool OnInit();
int OnExit();
int OnRun();
#ifdef __WXMAC__ #ifdef __WXMAC__
// Apple events // Apple events
virtual void MacOpenFile(const wxString &filename); virtual void MacOpenFile(const wxString &filename);
#endif #endif
#if !defined(_DEBUG) || defined(WITH_EXCEPTIONS)
void OnUnhandledException();
void OnFatalException();
#endif
// This function wraps all event handler calls anywhere in the application and is
// our ticket to catch exceptions happening in event handlers.
void HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const;
}; };
DECLARE_APP(AegisubApp) DECLARE_APP(AegisubApp)