class TOOLBAR_ITEM_TYPE: replace GROUP by TB_GROUP (collision with a Windows header)

common/dialogs/panel_toolbar_customization.cpp

@@ -72,7 +72,7 @@ public:
         m_name( aName )
     {
         wxASSERT( aType == TOOLBAR_ITEM_TYPE::CONTROL
-                  || aType == TOOLBAR_ITEM_TYPE::GROUP );
+                  || aType == TOOLBAR_ITEM_TYPE::TB_GROUP );
     }
 
     TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE aType, TOOL_ACTION* aAction ) :
@@ -286,7 +286,7 @@ std::optional<TOOLBAR_CONFIGURATION> PANEL_TOOLBAR_CUSTOMIZATION::parseToolbarTr
             config.AppendAction( *( tbData->GetAction() ) );
             break;
 
-        case TOOLBAR_ITEM_TYPE::GROUP:
+        case TOOLBAR_ITEM_TYPE::TB_GROUP:
             TOOLBAR_GROUP_CONFIG grpConfig( tbData->GetName() );
 
             if( m_toolbarTree->ItemHasChildren( mainId ) )
@@ -304,7 +304,7 @@ std::optional<TOOLBAR_CONFIGURATION> PANEL_TOOLBAR_CUSTOMIZATION::parseToolbarTr
 
                     switch( childTbData->GetType() )
                     {
-                    case TOOLBAR_ITEM_TYPE::GROUP:
+                    case TOOLBAR_ITEM_TYPE::TB_GROUP:
                     case TOOLBAR_ITEM_TYPE::SPACER:
                     case TOOLBAR_ITEM_TYPE::SEPARATOR:
                     case TOOLBAR_ITEM_TYPE::CONTROL:
@@ -408,10 +408,10 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree()
             break;
             }
 
-        case TOOLBAR_ITEM_TYPE::GROUP:
+        case TOOLBAR_ITEM_TYPE::TB_GROUP:
             {
             // Add a group of items to the toolbar
-            TOOLBAR_TREE_ITEM_DATA* groupTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::GROUP );
+            TOOLBAR_TREE_ITEM_DATA* groupTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::TB_GROUP );
             groupTreeItem->SetName( item.m_GroupName );
 
             wxTreeItemId groupId = m_toolbarTree->AppendItem( root, item.m_GroupName, -1, -1,
@@ -539,7 +539,7 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateActions()
 
 void PANEL_TOOLBAR_CUSTOMIZATION::onGroupPress( wxCommandEvent& aEvent )
 {
-    TOOLBAR_TREE_ITEM_DATA* treeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::GROUP,
+    TOOLBAR_TREE_ITEM_DATA* treeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::TB_GROUP,
                                                                    _( "Group" ) );
 
     wxTreeItemId newItem;
@@ -754,7 +754,7 @@ void PANEL_TOOLBAR_CUSTOMIZATION::onBtnAddAction( wxCommandEvent& event )
         TOOLBAR_TREE_ITEM_DATA* data =
                 dynamic_cast<TOOLBAR_TREE_ITEM_DATA*>( m_toolbarTree->GetItemData( selItem ) );
 
-        if( data && data->GetType() == TOOLBAR_ITEM_TYPE::GROUP )
+        if( data && data->GetType() == TOOLBAR_ITEM_TYPE::TB_GROUP )
         {
             // Insert into the end of the group
             newItem = m_toolbarTree->AppendItem( selItem, label, imgIdx, -1, toolTreeItem );
@@ -803,7 +803,7 @@ void PANEL_TOOLBAR_CUSTOMIZATION::onTreeBeginLabelEdit( wxTreeEvent& event )
             event.Veto();
             break;
 
-        case TOOLBAR_ITEM_TYPE::GROUP:
+        case TOOLBAR_ITEM_TYPE::TB_GROUP:
         case TOOLBAR_ITEM_TYPE::SPACER:
             // Do nothing here
             break;

common/tool/action_toolbar.cpp

@@ -280,7 +280,7 @@ void ACTION_TOOLBAR::ApplyConfiguration( const TOOLBAR_CONFIGURATION& aConfig )
             AddSpacer( item.m_Size );
             break;
 
-        case TOOLBAR_ITEM_TYPE::GROUP:
+        case TOOLBAR_ITEM_TYPE::TB_GROUP:
             {
             // Add a group of items to the toolbar
             std::vector<const TOOL_ACTION*> tools;
@@ -291,7 +291,7 @@ void ACTION_TOOLBAR::ApplyConfiguration( const TOOLBAR_CONFIGURATION& aConfig )
                 {
                 case TOOLBAR_ITEM_TYPE::SEPARATOR:
                 case TOOLBAR_ITEM_TYPE::SPACER:
-                case TOOLBAR_ITEM_TYPE::GROUP:
+                case TOOLBAR_ITEM_TYPE::TB_GROUP:
                 case TOOLBAR_ITEM_TYPE::CONTROL:
                     wxASSERT_MSG( false, "Unsupported group item type" );
                     continue;

common/tool/ui/toolbar_configuration.cpp

@@ -53,7 +53,7 @@ void to_json( nlohmann::json& aJson, const TOOLBAR_ITEM& aItem )
         aJson["name"] = aItem.m_ActionName;
         break;
 
-    case TOOLBAR_ITEM_TYPE::GROUP:
+    case TOOLBAR_ITEM_TYPE::TB_GROUP:
         aJson["group_name"] = aItem.m_GroupName;
 
         nlohmann::json grpItems = nlohmann::json::array();
@@ -106,7 +106,7 @@ void from_json( const nlohmann::json& aJson, TOOLBAR_ITEM& aItem )
 
         break;
 
-    case TOOLBAR_ITEM_TYPE::GROUP:
+    case TOOLBAR_ITEM_TYPE::TB_GROUP:
         if( aJson.contains( "group_name" ) )
             aItem.m_GroupName = aJson["group_name"].get<wxString>();
 

include/tool/ui/toolbar_configuration.h

@@ -36,7 +36,7 @@
 enum class TOOLBAR_ITEM_TYPE
 {
     TOOL,
-    GROUP,
+    TB_GROUP,
     SPACER,
     CONTROL,
     SEPARATOR
@@ -156,7 +156,7 @@ public:
 
     TOOLBAR_CONFIGURATION& AppendGroup( const TOOLBAR_GROUP_CONFIG& aGroup )
     {
-        TOOLBAR_ITEM item( TOOLBAR_ITEM_TYPE::GROUP );
+        TOOLBAR_ITEM item( TOOLBAR_ITEM_TYPE::TB_GROUP );
         item.m_GroupName = aGroup.GetName();
         item.m_GroupItems = aGroup.GetGroupItems();