Template fix + Minor fix

hugoam · May 4, 2015 · b3c658e · b3c658e
1 parent 2521e35
commit b3c658e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Ui/Scheme/mkDockbar.h b/src/Ui/Scheme/mkDockbar.h
@@ -20,6 +20,8 @@ namespace mk
 
 		void click();
 
+		static StyleType& cls() { static StyleType ty("DockToggle", ImgButton::cls()); return ty; }
+
 	protected:
 		Dockbox& mDockbox;
 	};

diff --git a/src/Ui/Widget/mkInput.h b/src/Ui/Widget/mkInput.h
@@ -21,14 +21,14 @@
 
 namespace mk
 {
-	template <class T_Val, class T_Arg = T_Val, class T_Input = typename Input<T_Val>>
+	template <class T_Val, class T_Arg = T_Val>
 	class Field : public Sequence
 	{
 	public:
 		Field(const string& label, const T_Val& value, std::function<void(T_Arg)> callback = nullptr, bool reverse = false)
 			: Sequence()
-			, mInput(this->makeappend<T_Input>(value, callback))
-			, mLabel(this->makeappend<Label>(label))
+			, mInput(this->template makeappend<typename Input<T_Val>>(value, callback))
+			, mLabel(this->template makeappend<Label>(label))
 		{
 			UNUSED(reverse);
 		}