Changeset 124 for cafu/branches/cafu_to_wx/CaWE/ChildFrame.cpp

Timestamp:

08/20/10 15:06:58 (21 months ago)

Author:

Carsten

Message:

Merged latest changes from trunk into branches/cafu_to_wx.

Files:

• cafu/branches/cafu_to_wx/CaWE/ChildFrame.cpp (modified) (4 diffs)

cafu/branches/cafu_to_wx/CaWE/ChildFrame.cpp

@@ -459 +459 @@
     wxToolBar* ToolbarTools=new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxTB_NODIVIDER);
     ToolbarTools->SetToolBitmapSize(wxSize(21, 18));
+
+    // Note that we cannot have separators between these tools, because they must all be in the same radio group.
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_SELECTION,             "Selection",               wxBitmap("CaWE/res/Tool_Selection.png", wxBITMAP_TYPE_PNG),      wxNullBitmap, "Selection",             "Selection" );
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_CAMERA,                "Camera",                  wxBitmap("CaWE/res/Tool_Camera.png", wxBITMAP_TYPE_PNG),         wxNullBitmap, "Camera"                 );
-    ToolbarTools->AddSeparator();
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_NEWBRUSH,              "New Brush",               wxBitmap("CaWE/res/Tool_NewBrush.png", wxBITMAP_TYPE_PNG),       wxNullBitmap, "New Brush"              );
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_NEWENTITY,             "New Entity",              wxBitmap("CaWE/res/Tool_NewEntity.png", wxBITMAP_TYPE_PNG),      wxNullBitmap, "New Entity"             );
@@ -468 +469 @@
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_NEWLIGHT,              "New Light",               wxBitmap("CaWE/res/Tool_NewLight.png", wxBITMAP_TYPE_PNG),       wxNullBitmap, "New Light"              );
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_NEWDECAL,              "New Decal",               wxBitmap("CaWE/res/Tool_NewDecal.png", wxBITMAP_TYPE_PNG),       wxNullBitmap, "New Decal"              );
-    ToolbarTools->AddSeparator();
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_EDITSURFACEPROPERTIES, "Edit Surface Properties", wxBitmap("CaWE/res/Tool_EditSurfProps.png", wxBITMAP_TYPE_PNG),  wxNullBitmap, "Edit Surface Properties");
     ToolbarTools->AddRadioTool(ID_MENU_TOOLS_TOOL_TERRAINEDITOR,         "Edit Terrain",            wxBitmap("CaWE/res/Tool_EditTerrain.png", wxBITMAP_TYPE_PNG),    wxNullBitmap, "Edit Terrain"           );
@@ -1134 +1134 @@
 void ChildFrameT::OnMenuTools(wxCommandEvent& CE)
 {
-    switch (CE.GetId())
-    {
-        case 0:
-        default:
-        {
-            // Find the tool whose wxWidgets event ID matches CE.GetId().
-            const ArrayT<ToolT*>& Tools=m_ToolManager->GetTools();
-
-            for (unsigned long ToolNr=0; ToolNr<Tools.Size(); ToolNr++)
-            {
-                ToolT* Tool=Tools[ToolNr];
-
-                if (Tool->GetWxEventID()==CE.GetId())
-                {
-                    m_ToolManager->SetActiveTool(Tool->GetType());
-                    break;
-                }
-            }
+    // Find the tool whose wxWidgets event ID matches CE.GetId().
+    const ArrayT<ToolT*>& Tools=m_ToolManager->GetTools();
+
+    for (unsigned long ToolNr=0; ToolNr<Tools.Size(); ToolNr++)
+    {
+        ToolT* Tool=Tools[ToolNr];
+
+        if (Tool->GetWxEventID()==CE.GetId())
+        {
+            m_ToolManager->SetActiveTool(Tool->GetType());
+            break;
         }
     }
@@ -1159 +1152 @@
 void ChildFrameT::OnMenuToolsUpdate(wxUpdateUIEvent& UE)
 {
-    switch (UE.GetId())
-    {
-        case 0:
-        default:
-        {
-            // Find the tool whose wxWidgets event ID matches UE.GetId().
-            const ArrayT<ToolT*>& Tools=m_ToolManager->GetTools();
-
-            for (unsigned long ToolNr=0; ToolNr<Tools.Size(); ToolNr++)
-            {
-                ToolT* Tool=Tools[ToolNr];
-
-                if (Tool->GetWxEventID()==UE.GetId())
-                {
-                    UE.Check(Tool->IsActiveTool());
-                    break;
-                }
-            }
-        }
-    }
+    const ToolT* ActiveTool=m_ToolManager->GetActiveTool();
+
+    if (ActiveTool && ActiveTool->GetWxEventID()==UE.GetId())
+        UE.Check(true);
 }