summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/os/main_loop.cpp8
-rw-r--r--core/os/main_loop.h2
-rw-r--r--core/os/os.h4
3 files changed, 3 insertions, 11 deletions
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp
index 4e0743809b..0d1a080682 100644
--- a/core/os/main_loop.cpp
+++ b/core/os/main_loop.cpp
@@ -44,8 +44,6 @@ void MainLoop::_bind_methods() {
BIND_VMETHOD(MethodInfo(Variant::BOOL, "_idle", PropertyInfo(Variant::FLOAT, "delta")));
BIND_VMETHOD(MethodInfo("_finalize"));
- BIND_VMETHOD(MethodInfo("_global_menu_action", PropertyInfo(Variant::NIL, "id"), PropertyInfo(Variant::NIL, "meta")));
-
BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
BIND_CONSTANT(NOTIFICATION_WM_ABOUT);
@@ -91,12 +89,6 @@ bool MainLoop::idle(float p_time) {
return false;
}
-void MainLoop::global_menu_action(const Variant &p_id, const Variant &p_meta) {
-
- if (get_script_instance())
- get_script_instance()->call("_global_menu_action", p_id, p_meta);
-}
-
void MainLoop::finish() {
if (get_script_instance()) {
diff --git a/core/os/main_loop.h b/core/os/main_loop.h
index 9d44af164a..8f6c8c91b1 100644
--- a/core/os/main_loop.h
+++ b/core/os/main_loop.h
@@ -62,8 +62,6 @@ public:
virtual bool idle(float p_time);
virtual void finish();
- virtual void global_menu_action(const Variant &p_id, const Variant &p_meta);
-
void set_init_script(const Ref<Script> &p_init_script);
MainLoop();
diff --git a/core/os/os.h b/core/os/os.h
index 17b688efc4..a31b1c1f4b 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -146,6 +146,9 @@ public:
virtual List<String> get_cmdline_args() const { return _cmdline; }
virtual String get_model_name() const;
+ bool is_layered_allowed() const { return _allow_layered; }
+ bool is_hidpi_allowed() const { return _allow_hidpi; }
+
void ensure_user_data_dir();
virtual MainLoop *get_main_loop() const = 0;
@@ -286,7 +289,6 @@ public:
virtual bool request_permissions() { return true; }
virtual Vector<String> get_granted_permissions() const { return Vector<String>(); }
- bool is_hidpi_allowed() const { return _allow_hidpi; }
virtual void process_and_drop_events() {}
OS();
virtual ~OS();