X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fbindings.h;h=bafd3bad97f80ecc19ecbbff2bf095f6bb60ce36;hb=d7686e3867e3c68cec0d3767a21f9d2408383085;hp=b73dc51cc308bfc0d74fefea3b0d5b2f4fe18512;hpb=7302a061c57602203895b616bf54d96269c677c6;p=libs%2Fgui.git

diff --git a/source/input/bindings.h b/source/input/bindings.h
index b73dc51..bafd3ba 100644
--- a/source/input/bindings.h
+++ b/source/input/bindings.h
@@ -2,6 +2,7 @@
 #define MSP_INPUT_BINDINGS_H_
 
 #include <msp/datafile/objectloader.h>
+#include <msp/graphics/mspgui_api.h>
 #include <msp/strings/lexicalcast.h>
 #include "control.h"
 #include "device.h"
@@ -12,10 +13,10 @@ namespace Input {
 
 class ControlScheme;
 
-class Bindings
+class MSPGUI_API Bindings
 {
 public:
-	class Loader: public DataFile::ObjectLoader<Bindings>
+	class MSPGUI_API Loader: public DataFile::ObjectLoader<Bindings>
 	{
 	private:
 		static ActionMap shared_actions;
@@ -24,7 +25,7 @@ public:
 		Loader(Bindings &);
 
 	private:
-		virtual void init_actions();
+		void init_actions() override;
 
 		void binding(const std::string &);
 		void device_type(DeviceType);
@@ -59,17 +60,19 @@ public:
 			Loader(Binding &);
 
 		private:
-			virtual void init_actions();
+			void init_actions() override;
 
 			void axis(unsigned, AxisSide);
 			void button(unsigned);
 			void key(Key k) { button(k); }
+			void mouse_axis(MouseAxis a, AxisSide s) { axis(a, s); }
+			void mouse_button(MouseButton b) { button(b); }
 		};
 
 		std::string control;
-		unsigned device;
-		ControlSrcType type;
-		unsigned index;
+		unsigned device = 0;
+		ControlSrcType type = NO_SOURCE;
+		unsigned index = 0;
 	};
 
 private: