summaryrefslogtreecommitdiff
path: root/glib/glibmm
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2022-04-07 15:21:36 +0200
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2022-04-07 15:21:36 +0200
commit85edfe90e1f34009bd3d60b65480f52893a4c9b9 (patch)
treef6e26c2af263e49424f0b98da8ec91f15b38ed80 /glib/glibmm
parent645947b3b8443995b58e3b5db1f953a80ec84d74 (diff)
downloadglibmm-85edfe90e1f34009bd3d60b65480f52893a4c9b9.tar.gz
Glib, Gio: Add some methods for glibmm 2.72
* configure.ac: * meson.build: Require glib-2.0 >= 2.71.2. * gio/src/dbusproxy.hg: signal_signal() accepts a signal name. * gio/src/file.[ccg|hg]: Add move_async() and move_finish(). * gio/src/socketclient.hg: Deprecate set/get/property_tls_validation_flags(). * gio/src/tlscertificate.hg: Add properties private_key, private_key_pem, pkcs11_uri, private_key_pkcs11_uri. * gio/src/tlsclientconnection.hg: Deprecate set/get/property_validation_flags(). * glib/glibmm/main.[cc|h]: Add create(MainContextFlags flags). * glib/src/enums.hg: Add enum Glib::MainContextFlags.
Diffstat (limited to 'glib/glibmm')
-rw-r--r--glib/glibmm/main.cc8
-rw-r--r--glib/glibmm/main.h15
2 files changed, 21 insertions, 2 deletions
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 038b4711..b46a615c 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -546,6 +546,14 @@ MainContext::create()
// static
Glib::RefPtr<MainContext>
+MainContext::create(MainContextFlags flags)
+{
+ return Glib::make_refptr_for_instance<MainContext>(
+ reinterpret_cast<MainContext*>(g_main_context_new_with_flags(static_cast<GMainContextFlags>(flags))));
+}
+
+// static
+Glib::RefPtr<MainContext>
MainContext::get_default()
{
return Glib::wrap(g_main_context_default(), true);
diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h
index 5e57c5ba..ecdfb9a7 100644
--- a/glib/glibmm/main.h
+++ b/glib/glibmm/main.h
@@ -20,6 +20,7 @@
#include <glibmm/refptr.h>
#include <glibmm/priorities.h>
#include <glibmm/iochannel.h>
+#include <glibmm/enums.h>
#include <sigc++/sigc++.h>
#include <vector>
#include <cstddef>
@@ -389,10 +390,20 @@ public:
MainContext(const MainContext& other) = delete;
MainContext& operator=(const MainContext& other) = delete;
- /** Creates a new MainContext.
- * @return The new MainContext.
+ /** Creates a new %MainContext.
+ * @return The new %MainContext.
*/
static Glib::RefPtr<MainContext> create();
+ /** Creates a new %MainContext.
+ *
+ * @param flags A bitwise-OR combination of MainContextFlags flags that
+ * can only be set at creation time.
+ * @return The new %MainContext.
+ *
+ * @newin{2,72}
+ */
+ static Glib::RefPtr<MainContext> create(MainContextFlags flags);
+
/** Returns the global default main context.
* This is the main context used for main loop functions when a main loop
* is not explicitly specified, and corresponds to the "main" main loop.