Ticket #2427: 2427.4.patch
File 2427.4.patch, 2.2 KB (added by , 10 years ago) |
---|
-
source/lib/sysdep/os/osx/dir_watch.cpp
1 /* Copyright (c) 201 3Wildfire Games1 /* Copyright (c) 2014 Wildfire Games 2 2 * 3 3 * Permission is hereby granted, free of charge, to any person obtaining 4 4 * a copy of this software and associated documentation files (the … … 188 188 { 189 189 if ( g_Stream == NULL ) 190 190 { 191 g_Stream = CreateEventStream( g_RootPaths ); 191 if (!g_RootPaths.empty()) 192 { 193 g_Stream = CreateEventStream( g_RootPaths ); 194 } 192 195 } 193 196 else 194 197 { -
source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp
1 /* Copyright (C) 201 2Wildfire Games.1 /* Copyright (C) 2014 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 144 144 int argc = 1; 145 145 char atlas[] = "atlas"; 146 146 char *argv[] = {atlas, NULL}; 147 wxEntry(argc, argv); 147 148 //Because this is not a bundle app(maverick requirement) 149 //and OSXIsGUIApplication return false, wxEntry doesn't call run main loop 150 //so We need to start GUI Manually 151 152 //This function can be used to perform the initialization of wxWidgets if you can't use the default initialization code for any reason. 153 //wxEntryCleanup must be called afterwards 154 wxEntryStart(argc, argv); 155 156 //Call App Initialization 157 wxTheApp->OnInit(); 158 159 //Run main loop (messages from os) 160 wxTheApp->OnRun(); 161 162 //Exit app 163 wxTheApp->OnExit(); 164 165 //Clean 166 wxEntryCleanup(); 167 148 168 #endif 149 169 } 150 170 … … 174 194 class AtlasDLLApp : public wxApp 175 195 { 176 196 public: 177 197 virtual bool OSXIsGUIApplication() 198 { 199 //Because this is not a bundle app(maverick requirement) return false 200 return false; 201 } 178 202 virtual bool OnInit() 179 203 { 180 204 // _CrtSetBreakAlloc(5632);