ported bobtoolz

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

diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index e4bd5a84056903c04fc7acdb7c14ff92f4ac8dea..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"
 
 
 #include "generic/callback.h"
 

-

 struct Accelerator
 {
   Accelerator(guint _key)
 struct Accelerator
 {
   Accelerator(guint _key)


@@ -51,6 +50,18 @@ inline Accelerator accelerator_null()
   return Accelerator(0, (GdkModifierType)0);
 }
 
   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);
 
 void keydown_accelerators_add(Accelerator accelerator, const Callback& callback);
 void keydown_accelerators_remove(Accelerator accelerator);