Merge branch 'master' of o_ggy@git.sourceforge.jp:/gitroot/moflib/moflib

[moflib/moflib.git] / saisei-1.0 / rpg / rpg / oldcode / Menu.hpp~

diff --git a/saisei-1.0/rpg/rpg/oldcode/Menu.hpp~ b/saisei-1.0/rpg/rpg/oldcode/Menu.hpp~
index b2284e7..c185a9d 100644 (file)
--- a/saisei-1.0/rpg/rpg/oldcode/Menu.hpp~
+++ b/saisei-1.0/rpg/rpg/oldcode/Menu.hpp~
@@ -1,39 +1,39 @@
-#pragma once\r
-#include <boost/function/function0.hpp>\r
-#include <boost/shared_ptr.hpp>\r
-#include "mof/MenuView.hpp"\r
-#include "mof/MenuItemInfo.hpp"\r
-\r
-namespace mof{\r
-\r
-       class LayoutManager;\r
-       class WidgetView;\r
-\r
-       class Menu : boost::noncopyable{\r
-               struct Impl;\r
-               boost::scoped_ptr<Impl> m_pImpl;\r
-       public:\r
-               \r
-               typedef boost::function0<void> Action;\r
-               struct MenuItem{\r
-                       MenuView* pView;\r
-                       Action action;\r
-               };\r
-\r
-               Menu( \r
-                       mof::WidgetView* pBackgroundView ,\r
-                       const tstring& front , const tstring& back , \r
-               );\r
-               ~Menu();\r
-               FrameNumber show(bool imidiately = false);\r
-               FrameNumber hide(bool imidiately = false);\r
-               void up();\r
-               void down();\r
-               void left();\r
-               void right();\r
-               void performAction() const;\r
-               void draw() const;\r
-               void update();\r
-\r
-       };\r
-}\r
+#pragma once
+#include <boost/function/function0.hpp>
+#include <boost/shared_ptr.hpp>
+#include "mof/MenuView.hpp"
+#include "mof/MenuItemInfo.hpp"
+
+namespace mof{
+
+       class LayoutManager;
+       class WidgetView;
+
+       class Menu : boost::noncopyable{
+               struct Impl;
+               boost::scoped_ptr<Impl> m_pImpl;
+       public:
+               
+               typedef boost::function0<void> Action;
+               struct MenuItem{
+                       MenuView* pView;
+                       Action action;
+               };
+
+               Menu( 
+                       mof::WidgetView* pBackgroundView ,
+                       const tstring& front , const tstring& back , 
+               );
+               ~Menu();
+               FrameNumber show(bool imidiately = false);
+               FrameNumber hide(bool imidiately = false);
+               void up();
+               void down();
+               void left();
+               void right();
+               void performAction() const;
+               void draw() const;
+               void update();
+
+       };
+}