Don't compile advanced Control nodes if disable_advanced_gui is on

core/object/script_language.h

@@ -287,7 +287,7 @@ class ScriptLanguage : public Object {
 	virtual ScriptNameCasing preferred_file_name_casing() const { return SCRIPT_NAME_CASING_SNAKE_CASE; }
 
 	// Keep enums in sync with:
-	// scene/gui/code_edit.h - CodeEdit::CodeCompletionKind
+	// scene/gui/advanced/code_edit.h - CodeEdit::CodeCompletionKind
 	enum CodeCompletionKind {
 		CODE_COMPLETION_KIND_CLASS,
 		CODE_COMPLETION_KIND_FUNCTION,
@@ -302,7 +302,7 @@ class ScriptLanguage : public Object {
 		CODE_COMPLETION_KIND_MAX
 	};
 
-	// scene/gui/code_edit.h - CodeEdit::CodeCompletionLocation
+	// scene/gui/advanced/code_edit.h - CodeEdit::CodeCompletionLocation
 	enum CodeCompletionLocation {
 		LOCATION_LOCAL = 0,
 		LOCATION_PARENT_MASK = 1 << 8,

editor/action_map_editor.cpp

@@ -35,9 +35,9 @@
 #include "editor/event_listener_line_edit.h"
 #include "editor/input_event_configuration_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 
 static bool _is_action_name_valid(const String &p_name) {
 	const char32_t *cstr = p_name.get_data();

editor/add_metadata_dialog.h

@@ -31,9 +31,9 @@
 #pragma once
 
 #include "editor/gui/editor_validation_panel.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 
 class AddMetadataDialog : public ConfirmationDialog {
 	GDCLASS(AddMetadataDialog, ConfirmationDialog);

editor/animation_track_editor.cpp

@@ -48,15 +48,15 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/tween.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/grid_container.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"

editor/animation_track_editor.h

@@ -34,10 +34,10 @@
 #include "editor/editor_properties.h"
 #include "editor/property_selector.h"
 #include "scene/3d/node_3d.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/control.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/animation.h"
 
 class AnimationMarkerEdit;

editor/code_editor.cpp

@@ -39,9 +39,10 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
+#include "scene/gui/texture_button.h"
 #include "scene/resources/font.h"
 
 void GotoLinePopup::popup_find_line(CodeTextEditor *p_text_editor) {

editor/code_editor.h

@@ -30,11 +30,11 @@
 
 #pragma once
 
+#include "scene/gui/advanced/code_edit.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/code_edit.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup.h"
 #include "scene/main/timer.h"

editor/connections_dialog.cpp

@@ -44,14 +44,14 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/spin_box.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
 	if (p_node != p_root && p_node->get_owner() != p_root) {

editor/connections_dialog.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
 
 class Button;
 class CheckBox;

editor/create_dialog.h

@@ -31,11 +31,11 @@
 #pragma once
 
 #include "editor/editor_help.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/tree.h"
 
 class CreateDialog : public ConfirmationDialog {
 	GDCLASS(CreateDialog, ConfirmationDialog);

editor/debugger/editor_debugger_node.cpp

@@ -45,7 +45,7 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/packed_scene.h"
 

editor/debugger/editor_debugger_tree.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/tree.h"
 
 class AcceptDialog;
 class SceneDebuggerTree;

editor/debugger/editor_performance_profiler.h

@@ -32,10 +32,10 @@
 
 #include "core/templates/hash_map.h"
 #include "main/performance.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tree.h"
 
 class EditorPerformanceProfiler : public HSplitContainer {
 	GDCLASS(EditorPerformanceProfiler, HSplitContainer);

editor/debugger/editor_profiler.h

@@ -30,15 +30,15 @@
 
 #pragma once
 
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 class ImageTexture;
 

editor/debugger/editor_visual_profiler.h

@@ -30,15 +30,15 @@
 
 #pragma once
 
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 class ImageTexture;
 

editor/debugger/script_editor_debugger.cpp

@@ -55,16 +55,14 @@
 #include "main/performance.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/debugger/scene_debugger.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/tree.h"
 #include "servers/debugger/servers_debugger.h"
 #include "servers/display_server.h"
 

editor/dependency_editor.h

@@ -30,10 +30,10 @@
 
 #pragma once
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/tree.h"
 
 class EditorFileDialog;
 class EditorFileSystemDirectory;

editor/directory_create_dialog.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class EditorValidationPanel;
 class Label;

editor/editor_about.cpp

@@ -36,9 +36,9 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_version_button.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/style_box.h"
 

editor/editor_about.h

@@ -30,12 +30,12 @@
 
 #pragma once
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 /**
  * NOTE: Do not assume the EditorNode singleton to be available in this class' methods.

editor/editor_asset_installer.cpp

@@ -40,11 +40,11 @@
 #include "editor/gui/editor_toaster.h"
 #include "editor/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
 #include "scene/gui/link_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 
 void EditorAssetInstaller::_item_checked_cbk() {
 	if (updating_source || !source_tree->get_edited()) {

editor/editor_asset_installer.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class CheckBox;
 class EditorFileDialog;

editor/editor_audio_buses.h

@@ -31,19 +31,19 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/texture_progress_bar.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 class EditorAudioBuses;
 class EditorFileDialog;

editor/editor_autoload_settings.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/tree.h"
 
 class EditorFileDialog;
 

editor/editor_build_profile.h

@@ -32,8 +32,8 @@
 
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class EditorBuildProfile : public RefCounted {
 	GDCLASS(EditorBuildProfile, RefCounted);

editor/editor_command_palette.cpp

@@ -35,9 +35,9 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/control.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/tree.h"
 
 EditorCommandPalette *EditorCommandPalette::singleton = nullptr;
 

editor/editor_command_palette.h

@@ -31,8 +31,8 @@
 #pragma once
 
 #include "core/input/shortcut.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class EditorCommandPalette : public ConfirmationDialog {
 	GDCLASS(EditorCommandPalette, ConfirmationDialog);

editor/editor_dock_manager.cpp

@@ -30,10 +30,10 @@
 
 #include "editor_dock_manager.h"
 
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/main/window.h"
 

editor/editor_dock_manager.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/split_container.h"
 
 class Button;
 class ConfigFile;