summaryrefslogtreecommitdiff
path: root/tools/editor/pane_drag.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-04 13:24:02 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-04 13:24:02 -0300
commitfbbe7dcdfbd09fc6ef5614dea2183481a27e4f4e (patch)
tree4e783f0e4347a2f612e6b85398c83a492d7b090f /tools/editor/pane_drag.h
parent7f5b744b92256e42aa3c700ee88d8318732935c6 (diff)
parent6f8bd899311d459b9e391b4acf72ccfa5cc1d806 (diff)
Merge remote-tracking branch 'origin/master'
Conflicts: drivers/windows/dir_access_windows.cpp
Diffstat (limited to 'tools/editor/pane_drag.h')
-rw-r--r--tools/editor/pane_drag.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/tools/editor/pane_drag.h b/tools/editor/pane_drag.h
index 268c940e35..a6cd9b6662 100644
--- a/tools/editor/pane_drag.h
+++ b/tools/editor/pane_drag.h
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2015 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 */
@@ -26,26 +26,26 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#ifndef PANE_DRAG_H
-#define PANE_DRAG_H
-
-#include "scene/gui/control.h"
-
-class PaneDrag : public Control {
-
- OBJ_TYPE( PaneDrag, Control );
-
- bool mouse_over;
-
-
-protected:
-
- void _input_event(const InputEvent& p_input);
- void _notification(int p_what);
- virtual Size2 get_minimum_size() const;
- static void _bind_methods();
-public:
- PaneDrag();
-};
-
-#endif // PANE_DRAG_H
+#ifndef PANE_DRAG_H
+#define PANE_DRAG_H
+
+#include "scene/gui/control.h"
+
+class PaneDrag : public Control {
+
+ OBJ_TYPE( PaneDrag, Control );
+
+ bool mouse_over;
+
+
+protected:
+
+ void _input_event(const InputEvent& p_input);
+ void _notification(int p_what);
+ virtual Size2 get_minimum_size() const;
+ static void _bind_methods();
+public:
+ PaneDrag();
+};
+
+#endif // PANE_DRAG_H