ported bobtoolz

[xonotic/netradiant.git] / libs / gtkutil / accelerator.h

diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index b34a98c16333019727654353dda06eb146fb4a98..4f7085a7d4dad2a1ec15b02dfdd90c2fd61caff6 100644 (file)
--- a/libs/gtkutil/accelerator.h
+++ b/libs/gtkutil/accelerator.h
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "generic/callback.h"
 
-
 struct Accelerator
 {
   Accelerator(guint _key)
@@ -51,6 +50,18 @@ inline Accelerator accelerator_null()
   return Accelerator(0, (GdkModifierType)0);
 }
 
+const char* global_keys_find(unsigned int key);
+unsigned int global_keys_find(const char* name);
+
+class TextOutputStream;
+void accelerator_write(const Accelerator& accelerator, TextOutputStream& ostream);
+
+template<typename TextOutputStreamType>
+TextOutputStreamType& ostream_write(TextOutputStreamType& ostream, const Accelerator& accelerator)
+{
+  accelerator_write(accelerator, ostream);
+  return ostream;
+}
 
 void keydown_accelerators_add(Accelerator accelerator, const Callback& callback);
 void keydown_accelerators_remove(Accelerator accelerator);
@@ -71,8 +82,8 @@ void global_accel_destroy();
 
 GClosure* global_accel_group_find(Accelerator accelerator);
 
-void command_connect_accelerator(const Accelerator& accelerator, const Callback& callback);
-void command_disconnect_accelerator(const Accelerator& accelerator, const Callback& callback);
+void global_accel_group_connect(const Accelerator& accelerator, const Callback& callback);
+void global_accel_group_disconnect(const Accelerator& accelerator, const Callback& callback);
 
 
 class Command