1 files changed, 8 insertions, 13 deletions

diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h
index d00bb41ff6..6650c5eb5d 100644
--- a/scene/gui/dialogs.h
+++ b/scene/gui/dialogs.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -42,13 +42,13 @@
 
 class WindowDialog : public Popup {
 
-	OBJ_TYPE(WindowDialog,Popup);
+	GDCLASS(WindowDialog,Popup);
 
 	TextureButton *close_button;
 	String title;
 	bool dragging;
 
-	void _input_event(const InputEvent& p_event);
+	void _gui_input(const InputEvent& p_event);
 	void _closed();
 protected:
 	virtual void _post_popup();
@@ -73,7 +73,7 @@ public:
 
 class PopupDialog : public Popup {
 
-	OBJ_TYPE(PopupDialog,Popup);
+	GDCLASS(PopupDialog,Popup);
 
 protected:
 	void _notification(int p_what);
@@ -89,13 +89,12 @@ class LineEdit;
 
 class AcceptDialog : public WindowDialog {
 
-	OBJ_TYPE(AcceptDialog,WindowDialog);
+	GDCLASS(AcceptDialog,WindowDialog);
 
-	Control *child;
 	HBoxContainer *hbc;
 	Label *label;
 	Button *ok;
-//	Button *cancel; no more cancel (there is X on tht titlebar)
+	//Button *cancel; no more cancel (there is X on tht titlebar)
 	bool hide_on_ok;
 
 
@@ -103,13 +102,11 @@ class AcceptDialog : public WindowDialog {
 	void _ok_pressed();
 	void _close_pressed();
 	void _builtin_text_entered(const String& p_text);
-	void _update_child_rect();
+	void _update_child_rects();
 
 	static bool swap_ok_cancel;
 
 
-	virtual void remove_child_notify(Node *p_child);
-
 
 protected:
 
@@ -140,8 +137,6 @@ public:
 	void set_text(String p_text);
 	String get_text() const;
 
-	void set_child_rect(Control *p_child);
-
 	AcceptDialog();
 	~AcceptDialog();
 
@@ -150,7 +145,7 @@ public:
 
 class ConfirmationDialog : public AcceptDialog {
 
-	OBJ_TYPE(ConfirmationDialog,AcceptDialog);
+	GDCLASS(ConfirmationDialog,AcceptDialog);
 	Button *cancel;
 protected:
 	static void _bind_methods();