Skip to content

Commit

Permalink
#5231: Start removing references to wxWidgets from the core module, l…
Browse files Browse the repository at this point in the history
…et's see how far I get
  • Loading branch information
codereader committed Jul 31, 2020
1 parent 565d89f commit d34d938
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 10 additions & 0 deletions radiant/ui/UserInterfaceModule.cpp
Expand Up @@ -17,6 +17,7 @@
#include "wxutil/MultiMonitor.h"
#include "wxutil/dialog/MessageBox.h"
#include "messages/TextureChanged.h"
#include "string/string.h"

#include "module/StaticModule.h"

Expand Down Expand Up @@ -56,6 +57,8 @@
#include "ui/brush/FindBrush.h"
#include "ui/mousetool/RegistrationHelper.h"

#include <wx/version.h>

namespace ui
{

Expand Down Expand Up @@ -102,6 +105,13 @@ void UserInterfaceModule::initialiseModule(const ApplicationContext& ctx)
{
rMessage() << getName() << "::initialiseModule called." << std::endl;

// Output the wxWidgets version to the logfile
std::string wxVersion = string::to_string(wxMAJOR_VERSION) + ".";
wxVersion += string::to_string(wxMINOR_VERSION) + ".";
wxVersion += string::to_string(wxRELEASE_NUMBER);

rMessage() << "wxWidgets Version: " << wxVersion << std::endl;

wxutil::MultiMonitor::printMonitorInfo();

registerUICommands();
Expand Down
9 changes: 0 additions & 9 deletions radiantcore/Radiant.cpp
Expand Up @@ -16,8 +16,6 @@
#include "settings/LanguageManager.h"
#endif

#include <wx/version.h>

namespace radiant
{

Expand Down Expand Up @@ -108,13 +106,6 @@ void Radiant::createLogFile()

// Write timestamp and thread information
rMessage() << "Today is " << std::put_time(&tm, TIME_FMT) << std::endl;

// Output the wxWidgets version to the logfile
std::string wxVersion = string::to_string(wxMAJOR_VERSION) + ".";
wxVersion += string::to_string(wxMINOR_VERSION) + ".";
wxVersion += string::to_string(wxRELEASE_NUMBER);

rMessage() << "wxWidgets Version: " << wxVersion << std::endl;
}
else
{
Expand Down
1 change: 0 additions & 1 deletion radiantcore/precompiled.h
Expand Up @@ -3,7 +3,6 @@
*/
#pragma once

#define DR_PRECOMPILED_WXWIDGETS
#define DR_PRECOMPILED_INTERFACES
#define DR_PRECOMPILED_MATH
#define DR_PRECOMPILED_REGISTRY
Expand Down

0 comments on commit d34d938

Please sign in to comment.