summaryrefslogtreecommitdiff
path: root/RealtimeSync/application.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:14 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:14 +0200
commit01eb8253196672c969a39587e90b49321a182428 (patch)
tree4a3b71d7913de519744466c9227fda6461c4f0b5 /RealtimeSync/application.cpp
parent5.0 (diff)
downloadFreeFileSync-01eb8253196672c969a39587e90b49321a182428.tar.gz
FreeFileSync-01eb8253196672c969a39587e90b49321a182428.tar.bz2
FreeFileSync-01eb8253196672c969a39587e90b49321a182428.zip
5.1
Diffstat (limited to 'RealtimeSync/application.cpp')
-rw-r--r--RealtimeSync/application.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/RealtimeSync/application.cpp b/RealtimeSync/application.cpp
index d45ae482..ead65eaa 100644
--- a/RealtimeSync/application.cpp
+++ b/RealtimeSync/application.cpp
@@ -33,7 +33,7 @@ bool Application::OnInit()
//Note: initialization is done in the FIRST idle event instead of OnInit. Reason: Commandline mode requires the wxApp eventhandler to be established
//for UI update events. This is not the case at the time of OnInit().
- Connect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), NULL, this);
+ Connect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), nullptr, this);
return true;
}
@@ -41,7 +41,7 @@ bool Application::OnInit()
void Application::OnStartApplication(wxIdleEvent& event)
{
- Disconnect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), NULL, this);
+ Disconnect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), nullptr, this);
//if appname is not set, the default is the executable's name!
SetAppName(wxT("FreeFileSync")); //use a different app name, to have "GetUserDataDir()" return the same directory as for FreeFileSync
@@ -83,7 +83,7 @@ void Application::OnStartApplication(wxIdleEvent& event)
if (!commandArgs.empty())
cfgFilename = commandArgs[0];
- MainDialog* frame = new MainDialog(NULL, cfgFilename);
+ MainDialog* frame = new MainDialog(nullptr, cfgFilename);
frame->SetIcon(GlobalResources::instance().programIcon); //set application icon
frame->Show();
}
bgstack15