diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp index adac953627..7c92c08d45 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -212,7 +212,7 @@ EnvironmentSidebar::EnvironmentSidebar(ScenarioEditor& scenarioEditor, wxWindow* wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this); scrolledWindow->SetScrollRate(10, 10); scrolledWindow->SetSizer(scrollSizer); - m_MainSizer->Add(scrolledWindow, wxSizerFlags().Expand().Proportion(1)); + m_MainSizer->Add(scrolledWindow, wxSizerFlags().Proportion(1).Expand()); wxSizer* waterSizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _T("Water settings")); scrollSizer->Add(waterSizer, wxSizerFlags().Expand()); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp index bfff3b4b56..2af3d58eb4 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp @@ -289,34 +289,41 @@ void MapSettingsControl::SendToEngine() MapSidebar::MapSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer) : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer), m_SimState(SimInactive) { - m_MapSettingsCtrl = new MapSettingsControl(this, m_ScenarioEditor); - m_MainSizer->Add(m_MapSettingsCtrl, wxSizerFlags().Expand()); + wxSizer* scrollSizer = new wxBoxSizer(wxVERTICAL); + wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this); + scrolledWindow->SetScrollRate(10, 10); + scrolledWindow->SetSizer(scrollSizer); + m_MainSizer->Add(scrolledWindow, wxSizerFlags().Expand().Proportion(1)); + + m_MapSettingsCtrl = new MapSettingsControl(scrolledWindow, m_ScenarioEditor); + scrollSizer->Add(m_MapSettingsCtrl, wxSizerFlags().Expand()); { ///////////////////////////////////////////////////////////////////////// // Random map settings - wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Random map")); + wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Random map")); + scrollSizer->Add(sizer, wxSizerFlags().Expand()); - sizer->Add(new wxChoice(this, ID_RandomScript), wxSizerFlags().Expand()); + sizer->Add(new wxChoice(scrolledWindow, ID_RandomScript), wxSizerFlags().Expand()); sizer->AddSpacer(5); - sizer->Add(new wxButton(this, ID_OpenPlayerPanel, _T("Change players")), wxSizerFlags().Expand()); + sizer->Add(new wxButton(scrolledWindow, ID_OpenPlayerPanel, _T("Change players")), wxSizerFlags().Expand()); sizer->AddSpacer(5); wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5); gridSizer->AddGrowableCol(1); - wxChoice* sizeChoice = new wxChoice(this, ID_RandomSize); - gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Map size")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT)); + wxChoice* sizeChoice = new wxChoice(scrolledWindow, ID_RandomSize); + gridSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Map size")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT)); gridSizer->Add(sizeChoice, wxSizerFlags().Expand()); - gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Random seed")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT)); + gridSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Random seed")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT)); wxBoxSizer* seedSizer = new wxBoxSizer(wxHORIZONTAL); - seedSizer->Add(Tooltipped(new wxTextCtrl(this, ID_RandomSeed, _T("0"), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_NUMERIC)), + seedSizer->Add(Tooltipped(new wxTextCtrl(scrolledWindow, ID_RandomSeed, _T("0"), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_NUMERIC)), _("Seed value for random map")), wxSizerFlags(1).Expand()); - seedSizer->Add(Tooltipped(new wxButton(this, ID_RandomReseed, _("R"), wxDefaultPosition, wxSize(24, -1)), + seedSizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_RandomReseed, _("R"), wxDefaultPosition, wxSize(24, -1)), _("New random seed"))); gridSizer->Add(seedSizer, wxSizerFlags().Expand()); @@ -324,30 +331,29 @@ MapSidebar::MapSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContaine sizer->AddSpacer(5); - sizer->Add(Tooltipped(new wxButton(this, ID_RandomGenerate, _("Generate map")), + sizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_RandomGenerate, _("Generate map")), _("Run selected random map script")), wxSizerFlags().Expand()); - - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); } { ///////////////////////////////////////////////////////////////////////// // Simulation buttons - wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Simulation test")); + wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Simulation test")); + scrollSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 8)); + wxGridSizer* gridSizer = new wxGridSizer(5); - gridSizer->Add(Tooltipped(new wxButton(this, ID_SimPlay, _("Play")), + gridSizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_SimPlay, _("Play"), wxDefaultPosition, wxSize(48, -1)), _("Run the simulation at normal speed")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new wxButton(this, ID_SimFast, _("Fast")), + gridSizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_SimFast, _("Fast"), wxDefaultPosition, wxSize(48, -1)), _("Run the simulation at 8x speed")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new wxButton(this, ID_SimSlow, _("Slow")), + gridSizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_SimSlow, _("Slow"), wxDefaultPosition, wxSize(48, -1)), _("Run the simulation at 1/8x speed")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new wxButton(this, ID_SimPause, _("Pause")), + gridSizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_SimPause, _("Pause"), wxDefaultPosition, wxSize(48, -1)), _("Pause the simulation")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new wxButton(this, ID_SimReset, _("Reset")), + gridSizer->Add(Tooltipped(new wxButton(scrolledWindow, ID_SimReset, _("Reset"), wxDefaultPosition, wxSize(48, -1)), _("Reset the editor to initial state")), wxSizerFlags().Expand()); sizer->Add(gridSizer, wxSizerFlags().Expand()); UpdateSimButtons(); - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); } } diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp index 93c17f8d9b..46aad3ccef 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp @@ -129,37 +129,43 @@ ObjectSidebar::ObjectSidebar( : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer), p(new ObjectSidebarImpl(scenarioEditor)) { + wxSizer* scrollSizer = new wxBoxSizer(wxVERTICAL); + wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this); + scrolledWindow->SetScrollRate(10, 10); + scrolledWindow->SetSizer(scrollSizer); + m_MainSizer->Add(scrolledWindow, wxSizerFlags().Proportion(1).Expand()); + wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(new wxStaticText(this, wxID_ANY, _("Filter")), wxSizerFlags().Align(wxALIGN_CENTER)); + sizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Filter")), wxSizerFlags().Align(wxALIGN_CENTER)); sizer->Add( Tooltipped( - new wxTextCtrl(this, ID_ObjectFilter), + new wxTextCtrl(scrolledWindow, ID_ObjectFilter), _("Enter text to filter object list") ), wxSizerFlags().Expand().Proportion(1) ); - m_MainSizer->Add(sizer, wxSizerFlags().Expand()); - m_MainSizer->AddSpacer(3); + scrollSizer->Add(sizer, wxSizerFlags().Expand()); + scrollSizer->AddSpacer(3); // ------------------------------------------------------------------------------------------ wxArrayString strings; strings.Add(_("Entities")); strings.Add(_("Actors (all)")); - wxChoice* objectType = new wxChoice(this, ID_ObjectType, wxDefaultPosition, wxDefaultSize, strings); + wxChoice* objectType = new wxChoice(scrolledWindow, ID_ObjectType, wxDefaultPosition, wxDefaultSize, strings); objectType->SetSelection(0); - m_MainSizer->Add(objectType, wxSizerFlags().Expand()); - m_MainSizer->AddSpacer(3); + scrollSizer->Add(objectType, wxSizerFlags().Expand()); + scrollSizer->AddSpacer(3); // ------------------------------------------------------------------------------------------ - p->m_ObjectListBox = new wxListBox(this, ID_SelectObject, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_HSCROLL); - m_MainSizer->Add(p->m_ObjectListBox, wxSizerFlags().Proportion(1).Expand()); - m_MainSizer->AddSpacer(3); + p->m_ObjectListBox = new wxListBox(scrolledWindow, ID_SelectObject, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_HSCROLL); + scrollSizer->Add(p->m_ObjectListBox, wxSizerFlags().Proportion(1).Expand()); + scrollSizer->AddSpacer(3); // ------------------------------------------------------------------------------------------ - m_MainSizer->Add(new wxButton(this, ID_ToggleViewer, _("Switch to Actor Viewer")), wxSizerFlags().Expand()); + scrollSizer->Add(new wxButton(scrolledWindow, ID_ToggleViewer, _("Switch to Actor Viewer")), wxSizerFlags().Expand()); // ------------------------------------------------------------------------------------------ diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp index 0a5006ba23..6409921e15 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -226,14 +226,14 @@ public: // Camera wxStaticBoxSizer* cameraSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Starting Camera")); wxGridSizer* gridSizer = new wxGridSizer(3); - wxButton* cameraSet = new wxButton(this, ID_CameraSet, _("Set")); + wxButton* cameraSet = new wxButton(this, ID_CameraSet, _("Set"), wxDefaultPosition, wxSize(48, -1)); gridSizer->Add(Tooltipped(cameraSet, _("Set player camera to this view")), wxSizerFlags().Expand()); - wxButton* cameraView = new wxButton(this, ID_CameraView, _("View")); + wxButton* cameraView = new wxButton(this, ID_CameraView, _("View"), wxDefaultPosition, wxSize(48, -1)); cameraView->Enable(false); gridSizer->Add(Tooltipped(cameraView, _("View the player camera")), wxSizerFlags().Expand()); - wxButton* cameraClear = new wxButton(this, ID_CameraClear, _("Clear")); + wxButton* cameraClear = new wxButton(this, ID_CameraClear, _("Clear"), wxDefaultPosition, wxSize(48, -1)); cameraClear->Enable(false); gridSizer->Add(Tooltipped(cameraClear, _("Clear player camera")), wxSizerFlags().Expand()); @@ -956,8 +956,14 @@ void PlayerSettingsControl::SendToEngine() PlayerSidebar::PlayerSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer) : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer), m_Loaded(false) { - m_PlayerSettingsCtrl = new PlayerSettingsControl(this, m_ScenarioEditor); - m_MainSizer->Add(m_PlayerSettingsCtrl, wxSizerFlags().Expand()); + wxSizer* scrollSizer = new wxBoxSizer(wxVERTICAL); + wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this); + scrolledWindow->SetScrollRate(10, 10); + scrolledWindow->SetSizer(scrollSizer); + m_MainSizer->Add(scrolledWindow, wxSizerFlags().Proportion(1).Expand()); + + m_PlayerSettingsCtrl = new PlayerSettingsControl(scrolledWindow, m_ScenarioEditor); + scrollSizer->Add(m_PlayerSettingsCtrl, wxSizerFlags().Expand()); } void PlayerSidebar::OnCollapse(wxCollapsiblePaneEvent& WXUNUSED(evt)) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp index 5ba909ca85..52166ab0dc 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -173,55 +173,61 @@ END_EVENT_TABLE(); TerrainSidebar::TerrainSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer) : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer) { + wxSizer* scrollSizer = new wxBoxSizer(wxVERTICAL); + wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this); + scrolledWindow->SetScrollRate(10, 10); + scrolledWindow->SetSizer(scrollSizer); + m_MainSizer->Add(scrolledWindow, wxSizerFlags().Proportion(1).Expand()); + { ///////////////////////////////////////////////////////////////////////// // Terrain elevation - wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Elevation tools")); + wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Elevation tools")); wxSizer* gridSizer = new wxGridSizer(4); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Modify"), _T("AlterElevation")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Modify"), _T("AlterElevation"), wxSize(48, -1)), _("Brush with left mouse buttons to raise terrain,\nright mouse button to lower it")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Ridge"), _T("PikeElevation")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Ridge"), _T("PikeElevation"), wxSize(48, -1)), _("Brush with left mouse buttons to raise terrain,\nright mouse button to lower it")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Smooth"), _T("SmoothElevation")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Smooth"), _T("SmoothElevation"), wxSize(48, -1)), _("Brush with left mouse button to smooth terrain,\nright mouse button to roughen it")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Flatten"), _T("FlattenElevation")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Flatten"), _T("FlattenElevation"), wxSize(48, -1)), _("Brush with left mouse button to flatten terrain")), wxSizerFlags().Expand()); sizer->Add(gridSizer, wxSizerFlags().Expand()); - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); + scrollSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); } { ///////////////////////////////////////////////////////////////////////// // Terrain texture - wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Texture tools")); + wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Texture tools")); wxSizer* gridSizer = new wxGridSizer(3); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Paint"), _T("PaintTerrain")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Paint"), _T("PaintTerrain"), wxSize(48, -1)), _("Brush with left mouse button to paint texture dominantly,\nright mouse button to paint submissively.\nShift-left-click for eyedropper tool")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Replace"), _T("ReplaceTerrain")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Replace"), _T("ReplaceTerrain"), wxSize(48, -1)), _("Replace all of a terrain texture with a new one")), wxSizerFlags().Expand()); - gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), this, _("Fill"), _T("FillTerrain")), + gridSizer->Add(Tooltipped(new ToolButton(scenarioEditor.GetToolManager(), scrolledWindow, _("Fill"), _T("FillTerrain"), wxSize(48, -1)), _T("Bucket fill a patch of terrain texture with a new one")), wxSizerFlags().Expand()); sizer->Add(gridSizer, wxSizerFlags().Expand()); - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); + scrollSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); } { ///////////////////////////////////////////////////////////////////////// // Brush settings - wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Brush")); + wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Brush")); - m_TexturePreview = new TexturePreviewPanel(this); + m_TexturePreview = new TexturePreviewPanel(scrolledWindow); sizer->Add(m_TexturePreview, wxSizerFlags(1).Expand()); - g_Brush_Elevation.CreateUI(this, sizer); - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); + g_Brush_Elevation.CreateUI(scrolledWindow, sizer); + scrollSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); } { ///////////////////////////////////////////////////////////////////////// // Visualise - wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Visualise")); - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); + wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Visualise")); + scrollSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); wxFlexGridSizer* visSizer = new wxFlexGridSizer(2, 5, 5); visSizer->AddGrowableCol(1); @@ -229,24 +235,24 @@ TerrainSidebar::TerrainSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebar wxArrayString defaultChoices; defaultChoices.Add(_("(none)")); - m_PassabilityChoice = new wxChoice(this, ID_Passability, wxDefaultPosition, wxDefaultSize, defaultChoices); + m_PassabilityChoice = new wxChoice(scrolledWindow, ID_Passability, wxDefaultPosition, wxDefaultSize, defaultChoices); m_PassabilityChoice->SetSelection(0); - visSizer->Add(new wxStaticText(this, wxID_ANY, _("Passability")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); + visSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Passability")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); visSizer->Add(Tooltipped(m_PassabilityChoice, _("View passability classes")), wxSizerFlags().Expand()); - visSizer->Add(new wxStaticText(this, wxID_ANY, _("Priorities")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); - visSizer->Add(Tooltipped(new wxCheckBox(this, ID_ShowPriorities, _("")), + visSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Priorities")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); + visSizer->Add(Tooltipped(new wxCheckBox(scrolledWindow, ID_ShowPriorities, _("")), _("Show terrain texture priorities"))); } { ///////////////////////////////////////////////////////////////////////// // Misc tools - wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Misc tools")); - sizer->Add(new wxButton(this, ID_ResizeMap, _("Resize map")), wxSizerFlags().Expand()); - m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); + wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _("Misc tools")); + sizer->Add(new wxButton(scrolledWindow, ID_ResizeMap, _("Resize map")), wxSizerFlags().Expand()); + scrollSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10)); } m_BottomBar = new TerrainBottomBar(scenarioEditor, bottomBarContainer);