1 files changed, 27 insertions, 8 deletions

diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h
index 1365b1df24..81e82d851e 100644
--- a/scene/gui/dialogs.h
+++ b/scene/gui/dialogs.h
@@ -45,11 +45,19 @@ class AcceptDialog : public Window {
 	GDCLASS(AcceptDialog, Window);
 
 	Window *parent_visible = nullptr;
-	Panel *bg;
-	HBoxContainer *hbc;
-	Label *label;
-	Button *ok;
+
+	Panel *bg_panel = nullptr;
+	Label *message_label = nullptr;
+	HBoxContainer *buttons_hbox = nullptr;
+	Button *ok_button = nullptr;
+
 	bool hide_on_ok = true;
+	bool close_on_escape = true;
+
+	struct ThemeCache {
+		Ref<StyleBox> panel_style;
+		int buttons_separation = 0;
+	} theme_cache;
 
 	void _custom_action(const String &p_action);
 	void _update_child_rects();
@@ -61,6 +69,7 @@ class AcceptDialog : public Window {
 
 protected:
 	virtual Size2 _get_contents_minimum_size() const override;
+	virtual void _update_theme_item_cache() override;
 
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -74,12 +83,12 @@ protected:
 	void _cancel_pressed();
 
 public:
-	Label *get_label() { return label; }
+	Label *get_label() { return message_label; }
 	static void set_swap_cancel_ok(bool p_swap);
 
 	void register_text_enter(Control *p_line_edit);
 
-	Button *get_ok_button() { return ok; }
+	Button *get_ok_button() { return ok_button; }
 	Button *add_button(const String &p_text, bool p_right = false, const String &p_action = "");
 	Button *add_cancel_button(const String &p_cancel = "");
 	void remove_button(Control *p_button);
@@ -87,26 +96,36 @@ public:
 	void set_hide_on_ok(bool p_hide);
 	bool get_hide_on_ok() const;
 
+	void set_close_on_escape(bool p_enable);
+	bool get_close_on_escape() const;
+
 	void set_text(String p_text);
 	String get_text() const;
 
 	void set_autowrap(bool p_autowrap);
 	bool has_autowrap();
 
+	void set_ok_button_text(String p_ok_button_text);
+	String get_ok_button_text() const;
+
 	AcceptDialog();
 	~AcceptDialog();
 };
 
 class ConfirmationDialog : public AcceptDialog {
 	GDCLASS(ConfirmationDialog, AcceptDialog);
-	Button *cancel;
+	Button *cancel = nullptr;
 
 protected:
 	static void _bind_methods();
 
 public:
 	Button *get_cancel_button();
+
+	void set_cancel_button_text(String p_cancel_button_text);
+	String get_cancel_button_text() const;
+
 	ConfirmationDialog();
 };
 
-#endif
+#endif // DIALOGS_H