J :

* Clean carriage returns.

JGE/include/JGui.h

@@ -26,90 +26,86 @@
 
 class JGuiListener
 {
-public:
+ public:
-	virtual ~JGuiListener() {}
+  virtual ~JGuiListener() {}
-	virtual void ButtonPressed(int controllerId, int controlId) = 0;
+  virtual void ButtonPressed(int controllerId, int controlId) = 0;
 };
 
 
 class JGuiObject
 {
-protected:
+ protected:
-	static JGE*	mEngine;
+  static JGE*	mEngine;
 
-private:
+ private:
-	int mId;
+  int mId;
 
 
-public:
+ public:
-	JGuiObject(int id);
+  JGuiObject(int id);
-	virtual ~JGuiObject();
+  virtual ~JGuiObject();
 
-	virtual void Render() = 0;
+  virtual void Render() = 0;
-	virtual void Update(float dt);
+  virtual void Update(float dt);
 
-	virtual void Entering();			// when focus is transferring to this obj
+  virtual void Entering();			// when focus is transferring to this obj
-	virtual bool Leaving(u32 key);		// when focus is transferring away from this obj, true to go ahead
+  virtual bool Leaving(u32 key);		// when focus is transferring away from this obj, true to go ahead
-	virtual bool ButtonPressed();		// action button pressed, return false to ignore
+  virtual bool ButtonPressed();		// action button pressed, return false to ignore
 
-	int GetId();
+  int GetId();
 };
 
 
 class JGuiController
 {
-protected:
+ protected:
-	static JGE*	mEngine;
+  static JGE*	mEngine;
 
-	int mId;
+  int mId;
-	bool mActive;
+  bool mActive;
 
 
-	u32	mActionButton;
+  u32	mActionButton;
-	int mCurr;
+  int mCurr;
-	int mStyle;
+  int mStyle;
 
-	JSprite* mCursor;
+  JSprite* mCursor;
-	bool mShowCursor;
+  bool mShowCursor;
-	int mCursorX;
+  int mCursorX;
-	int mCursorY;
+  int mCursorY;
 
-	int mBgX;
+  int mBgX;
-	int mBgY;
+  int mBgY;
-	const JTexture* mBg;
+  const JTexture* mBg;
-	PIXEL_TYPE mShadingColor;
+  PIXEL_TYPE mShadingColor;
-	Rect* mShadingBg;
+  Rect* mShadingBg;
 
-	JGuiListener* mListener;
+  JGuiListener* mListener;
-	u32 mLastKey;
+  //int mKeyHoldTime;
-	//int mKeyHoldTime;
-	float mKeyRepeatDelay;
 
-	bool KeyRepeated(u32 key, float dt);
+ public:
+  JGuiObject* mObjects[MAX_GUIOBJECT];
+  int mCount;
 
-public:
+  JGuiController(int id, JGuiListener* listener);
-	JGuiObject* mObjects[MAX_GUIOBJECT];
+  ~JGuiController();
-	int mCount;
 
-	JGuiController(int id, JGuiListener* listener);
+  virtual void Render();
-	~JGuiController();
+  virtual void Update(float dt);
 
-	virtual void Render();
+  void Add(JGuiObject* ctrl);
-	virtual void Update(float dt);
+  void Remove(int id);
+  void Remove(JGuiObject* ctrl);
 
-	void Add(JGuiObject* ctrl);
+  void SetActionButton(u32 button);
-	void Remove(int id);
+  void SetStyle(int style);
-	void Remove(JGuiObject* ctrl);
+  void SetCursor(JSprite* cursor);
 
-	void SetActionButton(u32 button);
+  bool IsActive();
-	void SetStyle(int style);
+  void SetActive(bool flag);
-	void SetCursor(JSprite* cursor);
 
-	bool IsActive();
+  //void SetImageBackground(const JTexture* tex, int x, int y);
-	void SetActive(bool flag);
+  //void SetShadingBackground(int x, int y, int width, int height, PIXEL_TYPE color);
-
-	//void SetImageBackground(const JTexture* tex, int x, int y);
-	//void SetShadingBackground(int x, int y, int width, int height, PIXEL_TYPE color);
 };