Changeset 10129 for ps

Timestamp:

08/28/11 23:10:45 (13 years ago)

Author:

ben

Message:

Changes Atlas toolbar construction to use CreateToolBar instead of explicitly setting it (which doesn't work on wxOSX 2.9).
Adds a call to Atlas_GLSetCurrent after setting Atlas resolution on OS X (otherwise the canvas doesn't seem to update properly).

Location:

ps/trunk/source/tools/atlas

Files:

• AtlasUI/CustomControls/Buttons/ToolButton.cpp (modified) (2 diffs)
• AtlasUI/CustomControls/Buttons/ToolButton.h (modified) (2 diffs)
• AtlasUI/ScenarioEditor/ScenarioEditor.cpp (modified) (3 diffs)
• AtlasUI/ScenarioEditor/ScenarioEditor.h (modified) (2 diffs)
• GameInterface/Handlers/GraphicsSetupHandlers.cpp (modified) (2 diffs)

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -70 +70 @@
 END_EVENT_TABLE()
 
-ToolButtonBar::ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID)
-: wxToolBar(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL)
+ToolButtonBar::ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID, long style)
+: wxToolBar(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style)
 , m_ToolManager(toolManager), m_SectionLayout(sectionLayout), m_Id(baseID), m_Size(-1)
 {

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -45 +45 @@
 {
 public:
-    ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID);
+    ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID, long style);
     void AddToolButton(const wxString& shortLabel, const wxString& longLabel,
         const wxString& iconPNGFilename, const wxString& toolName, const wxString& sectionPage);

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

@@ -32 +32 @@
 #include "General/Datafile.h"
 
-#include "CustomControls/HighResTimer/HighResTimer.h"
 #include "CustomControls/Buttons/ToolButton.h"
 #include "CustomControls/Canvas/Canvas.h"
+#include "CustomControls/HighResTimer/HighResTimer.h"
 
 #include "GameInterface/MessagePasser.h"
@@ -450 +450 @@
 
     // Toolbar:
-
-    ToolButtonBar* toolbar = new ToolButtonBar(m_ToolManager, this, &m_SectionLayout, ID_Toolbar);
-    // TODO: configurable small vs large icon images
-
-    // (button label; tooltip text; image; internal tool name; section to switch to)
-    toolbar->AddToolButton(_("Default"),       _("Default"),                   _T("default.png"),          _T(""),                 _T(""));
-    toolbar->AddToolButton(_("Move"),          _("Move/rotate object"),        _T("moveobject.png"),       _T("TransformObject"),  _T("")/*_T("ObjectSidebar")*/);
-    toolbar->AddToolButton(_("Elevation"),     _("Alter terrain elevation"),   _T("alterelevation.png"),   _T("AlterElevation"),   _T("")/*_T("TerrainSidebar")*/);
-    toolbar->AddToolButton(_("Smooth"),        _("Smooth terrain elevation"),  _T("smoothelevation.png"),  _T("SmoothElevation"),  _T("")/*_T("TerrainSidebar")*/);
-    toolbar->AddToolButton(_("Flatten"),       _("Flatten terrain elevation"), _T("flattenelevation.png"), _T("FlattenElevation"), _T("")/*_T("TerrainSidebar")*/);
-    toolbar->AddToolButton(_("Paint Terrain"), _("Paint terrain texture"),     _T("paintterrain.png"),     _T("PaintTerrain"),     _T("")/*_T("TerrainSidebar")*/);
-
-    toolbar->Realize();
-    SetToolBar(toolbar);
+    // wxOSX/Cocoa 2.9 doesn't seem to like SetToolBar, so we use CreateToolBar which implicitly associates
+    //  the toolbar with the frame, and use OnCreateToolBar to construct our custom toolbar
+    //  (this should be equivalent behavior on all platforms)
+    CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL, ID_Toolbar);
+
     // Set the default tool to be selected
     m_ToolManager.SetCurrentTool(_T(""));
@@ -536 +527 @@
 }
 
+wxToolBar* ScenarioEditor::OnCreateToolBar(long style, wxWindowID id, const wxString& WXUNUSED(name))
+{
+    ToolButtonBar* toolbar = new ToolButtonBar(m_ToolManager, this, &m_SectionLayout, id, style);
+    // TODO: configurable small vs large icon images
+
+    // (button label; tooltip text; image; internal tool name; section to switch to)
+    toolbar->AddToolButton(_("Default"),       _("Default"),                   _T("default.png"),          _T(""),                 _T(""));
+    toolbar->AddToolButton(_("Move"),          _("Move/rotate object"),        _T("moveobject.png"),       _T("TransformObject"),  _T("")/*_T("ObjectSidebar")*/);
+    toolbar->AddToolButton(_("Elevation"),     _("Alter terrain elevation"),   _T("alterelevation.png"),   _T("AlterElevation"),   _T("")/*_T("TerrainSidebar")*/);
+    toolbar->AddToolButton(_("Smooth"),        _("Smooth terrain elevation"),  _T("smoothelevation.png"),  _T("SmoothElevation"),  _T("")/*_T("TerrainSidebar")*/);
+    toolbar->AddToolButton(_("Flatten"),       _("Flatten terrain elevation"), _T("flattenelevation.png"), _T("FlattenElevation"), _T("")/*_T("TerrainSidebar")*/);
+    toolbar->AddToolButton(_("Paint Terrain"), _("Paint terrain texture"),     _T("paintterrain.png"),     _T("PaintTerrain"),     _T("")/*_T("TerrainSidebar")*/);
+
+    toolbar->Realize();
+
+    return toolbar;
+}
+
 float ScenarioEditor::GetSpeedModifier()
 {

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h

@@ -19 +19 @@
 #define INCLUDED_SCENARIOEDITOR
 
+#include "wx/toolbar.h"
+
 #include "General/AtlasWindowCommandProc.h"
 #include "General/Observable.h"
@@ -35 +37 @@
     void OnTimer(wxTimerEvent& event);
     void OnIdle(wxIdleEvent& event);
+    wxToolBar* OnCreateToolBar(long style, wxWindowID id, const wxString &name);
     
     void OnNew(wxCommandEvent& event);

ps/trunk/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -163 +163 @@
 {
     CVideoMode::UpdateRenderer(msg->width, msg->height);
+
+#if OS_MACOSX
+    // OS X seems to require this to update the GL canvas
+    Atlas_GLSetCurrent(const_cast<void*>(g_GameLoop->glCanvas));
+#endif
 }