Define devconsole only when ENABLE_SCRIPTING is on

This commit is contained in:
David Capello 2016-11-24 16:19:19 -03:00
parent 128ba90394
commit ebec853a54
2 changed files with 9 additions and 2 deletions

View File

@ -90,8 +90,10 @@ public:
MainWindow::MainWindow() MainWindow::MainWindow()
: m_mode(NormalMode) : m_mode(NormalMode)
, m_homeView(nullptr) , m_homeView(nullptr)
, m_devConsoleView(nullptr)
, m_scalePanic(nullptr) , m_scalePanic(nullptr)
#ifdef ENABLE_SCRIPTING
, m_devConsoleView(nullptr)
#endif
{ {
// Load all menus by first time. // Load all menus by first time.
AppMenus::instance()->reload(); AppMenus::instance()->reload();
@ -154,11 +156,14 @@ MainWindow::~MainWindow()
{ {
delete m_scalePanic; delete m_scalePanic;
#ifdef ENABLE_SCRIPTING
if (m_devConsoleView) { if (m_devConsoleView) {
if (m_devConsoleView->parent()) if (m_devConsoleView->parent())
m_workspace->removeView(m_devConsoleView); m_workspace->removeView(m_devConsoleView);
delete m_devConsoleView; delete m_devConsoleView;
} }
#endif
if (m_homeView) { if (m_homeView) {
if (m_homeView->parent()) if (m_homeView->parent())
m_workspace->removeView(m_homeView); m_workspace->removeView(m_homeView);

View File

@ -114,9 +114,11 @@ namespace app {
Workspace* m_workspace; Workspace* m_workspace;
PreviewEditorWindow* m_previewEditor; PreviewEditorWindow* m_previewEditor;
HomeView* m_homeView; HomeView* m_homeView;
DevConsoleView* m_devConsoleView;
Notifications* m_notifications; Notifications* m_notifications;
INotificationDelegate* m_scalePanic; INotificationDelegate* m_scalePanic;
#ifdef ENABLE_SCRIPTING
DevConsoleView* m_devConsoleView;
#endif
}; };
} }