jcomponent.h		jcomponent.h
	skipping to change at line 165		skipping to change at line 165
	_is_visible,		_is_visible,
	_ignore_repaint,		_ignore_repaint,
	_background_visible,		_background_visible,
	_is_focusable,		_is_focusable,
	_enabled,		_enabled,
	_theme_enabled,		_theme_enabled,
	_is_opaque,		_is_opaque,
	_is_valid;		_is_valid;
	protected:		protected:
	/**
	* \brief render surface using component_border_t parameter
	*
	*/
	void FillRectangle(Graphics *g, int x, int y, int width, int
	height);
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	Component(int x = 0, int y = 0, int width = 0, int height = 0);		Component(int x = 0, int y = 0, int width = 0, int height = 0);
	/**		/**
	* \brief		* \brief
	skipping to change at line 758		skipping to change at line 753
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Paint(Graphics *g);		virtual void Paint(Graphics *g);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void PaintEdges(Graphics *g);		virtual void PaintBorderBackground(Graphics *g);
			/**
			* \brief
			*
			*/
			virtual void PaintBorderEdges(Graphics *g);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Repaint(bool all = false);		virtual void Repaint(bool all = false);
	/**		/**
	* \brief		* \brief
	*		*
End of changes. 2 change blocks.
	7 lines changed or deleted		6 lines changed or added

	jframe.h		jframe.h
	skipping to change at line 130		skipping to change at line 130
	int _init_type,		int _init_type,
	_relative_mouse_x,		_relative_mouse_x,
	_relative_mouse_y,		_relative_mouse_y,
	_relative_mouse_w,		_relative_mouse_w,
	_relative_mouse_h,		_relative_mouse_h,
	_mouse_state;		_mouse_state;
	int _old_x,		int _old_x,
	_old_y,		_old_y,
	_old_width,		_old_width,
	_old_height;		_old_height;
	bool _input_locked,		bool _input_enabled,
	_input_enabled,
	_background_visible,		_background_visible,
	_move_enabled,		_move_enabled,
	_release_enabled,		_release_enabled,
	_resize_enabled,		_resize_enabled,
	_is_maximized;		_is_maximized;
	jframe_button_t _frame_buttons;		jframe_button_t _frame_buttons;
	jkey_symbol_t _last_key_code;		jkey_symbol_t _last_key_code;
	jcursor_style_t _default_cursor;		jcursor_style_t _default_cursor;
	public:		public:
End of changes. 1 change blocks.
	2 lines changed or deleted		1 lines changed or added

	jgraphics.h		jgraphics.h
	skipping to change at line 51		skipping to change at line 51
	#define DEFAULT_FONT_SIZE 20		#define DEFAULT_FONT_SIZE 20
	#define TRUNC_COLOR(r, g, b, a) \		#define TRUNC_COLOR(r, g, b, a) \
	r = (r < 0)?0:(r > 0xff)?0xff:r; \		r = (r < 0)?0:(r > 0xff)?0xff:r; \
	g = (g < 0)?0:(g > 0xff)?0xff:g; \		g = (g < 0)?0:(g > 0xff)?0xff:g; \
	b = (b < 0)?0:(b > 0xff)?0xff:b; \		b = (b < 0)?0:(b > 0xff)?0xff:b; \
	a = (a < 0)?0:(a > 0xff)?0xff:a; \		a = (a < 0)?0:(a > 0xff)?0xff:a; \
	#define SCALE_TO_SCREEN(x, y, z) \		#define SCALE_TO_SCREEN(x, y, z) \
	(int)floor(((double)x*(double)y)/(double)z)		(int)round(((double)x*(double)y)/(double)z)
	#define SCREEN_TO_SCALE(x, z, y) \		#define SCREEN_TO_SCALE(x, z, y) \
	(int)floor(((double)x*(double)y)/(double)z)		(int)round(((double)x*(double)y)/(double)z)
	namespace jgui{		namespace jgui{
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	enum jporter_duff_flags_t {		enum jporter_duff_flags_t {
	PDF_NONE = 0x0001, // fs: sa fd: 1.0-sa (defaults)		PDF_NONE = 0x0001, // fs: sa fd: 1.0-sa (defaults)
	PDF_CLEAR = 0x0002, // fs: 0.0 fd: 0.0		PDF_CLEAR = 0x0002, // fs: 0.0 fd: 0.0
	skipping to change at line 127		skipping to change at line 127
	TOP_VALIGN,		TOP_VALIGN,
	CENTER_VALIGN,		CENTER_VALIGN,
	BOTTOM_VALIGN,		BOTTOM_VALIGN,
	JUSTIFY_VALIGN		JUSTIFY_VALIGN
	};		};
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	enum jline_type_t {		enum jline_join_t {
	RECT_LINE = 0x01,		BEVEL_JOIN = 0x01,
	ROUND_LINE = 0x02		ROUND_JOIN = 0x02,
			MITER_JOIN = 0x04,
	};		};
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	enum jline_style_t {		enum jline_style_t {
	SOLID_LINE = 0x01,		SOLID_LINE = 0x01,
	DASH_LINE = 0x02,		DASH_LINE = 0x02,
	DASH_DOT_LINE = 0x04,		DASH_DOT_LINE = 0x04,
	skipping to change at line 234		skipping to change at line 235
	/**		/**
	* \brief		* \brief
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class Graphics : public virtual jcommon::Object{		class Graphics : public virtual jcommon::Object{
	friend class Window;		friend class Window;
	friend class OffScreenImage;		friend class OffScreenImage;
	protected:
	Graphics(void *s);
	private:		private:
	jthread::Mutex graphics_mutex;		jthread::Mutex graphics_mutex;
	#ifdef DIRECTFB_UI		#ifdef DIRECTFB_UI
	IDirectFBSurface *surface;		IDirectFBSurface *surface;
	#endif		#endif
	struct jregion_t _clip;		struct jregion_t _clip;
	struct jpoint_t _translate;		struct jpoint_t _translate;
	struct jsize_t _screen;		struct jsize_t _screen;
	struct jsize_t _scale;		struct jsize_t _scale;
	struct jcolor_t _color;		struct jcolor_t _color;
	jline_type_t _line_type;		jline_join_t _line_join;
	jline_style_t _line_style;		jline_style_t _line_style;
	jdrawing_flags_t _draw_flags;		jdrawing_flags_t _draw_flags;
	jblitting_flags_t _blit_flags;		jblitting_flags_t _blit_flags;
	jporter_duff_flags_t _porter_duff_flags;		jporter_duff_flags_t _porter_duff_flags;
	Font *_font;		Font *_font;
	double _radians;		double _radians;
	int _line_width;		int _line_width;
			bool _is_premultiply,
			_antialias_enabled;
	#ifdef DIRECTFB_UI		#ifdef DIRECTFB_UI
	struct edge_t {		struct edge_t {
			struct edge_t *next;
	int yUpper;		int yUpper;
	double xIntersect;		double xIntersect;
	double dxPerScan;		double dxPerScan;
	struct edge_t *next;
	};		};
	void insertEdge(edge_t *list, edge_t *edge);		void MakeEdgeRec(struct jpoint_t lower, struct jpoint_t uppe
	void makeEdgeRec(struct jpoint_t lower, struct jpoint_t uppe		r, int yComp, edge_t *edge, edge_t *edges[]);
	r, int yComp, edge_t *edge, edge_t *edges[]);		void FillScan(int scan, edge_t *active);
	void fillScan(int scan, edge_t *active);		int YNext(int k, int cnt, jpoint_t pts[]);
	int yNext(int k, int cnt, jpoint_t pts[]);		void BuildEdgeList(int cnt, jpoint_t pts[], edge_t *edges[])
	void buildEdgeList(int cnt, jpoint_t pts[], edge_t *edges[])		;
	;		void InsertEdge(edge_t *list, edge_t *edge);
	void updateActiveList(int scan, edge_t *active);		void UpdateActiveList(int scan, edge_t *active);
	void Polygon(int n, int coordinates[]);		void Polygon(int n, int coordinates[]);
	void Fill_polygon(int n, int ppts[]);		void FillPolygon0(int n, int ppts[]);
			double EvaluateBezier0(double *data, int ndata, double t);
			void DrawRectangle0(int xp, int yp, int wp, int hp, int dx,
			int dy, jline_join_t join, int size);
			void DrawEllipse0(int xcp, int ycp, int rxp, int ryp, int si
			ze);
			void DrawArc0(int xcp, int ycp, int rxp, int ryp, double arc
			0, double arc1, int size, int quadrant);
			void DrawPie0(int xcp, int ycp, int rxp, int ryp, double arc
			0, double arc1, int size);
			void DrawChord0(int xcp, int ycp, int rxp, int ryp, double a
			rc0, double arc1, int size);
			void RotateImage0(OffScreenImage *img, int xc, int yc, int x
			, int y, int width, int height, double angle, uint8_t alpha);
	#endif		#endif
	void RotateImage(OffScreenImage *img, int xc, int yc, int x,		protected:
	int y, int width, int height, double angle, uint8_t alpha);		Graphics(void *s, bool offscreen);
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual ~Graphics();		virtual ~Graphics();
	/**		/**
	* \brief		* \brief
	skipping to change at line 427		skipping to change at line 439
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual Font * GetFont();		virtual Font * GetFont();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
			virtual void SetAntiAliasEnabled(bool b);
			/**
			* \brief
			*
			*/
	virtual jporter_duff_flags_t GetPorterDuffFlags();		virtual jporter_duff_flags_t GetPorterDuffFlags();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jdrawing_flags_t GetDrawingFlags();		virtual jdrawing_flags_t GetDrawingFlags();
	/**		/**
	* \brief		* \brief
	skipping to change at line 475		skipping to change at line 493
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual uint32_t GetPixel(int xp, int yp);		virtual uint32_t GetPixel(int xp, int yp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetLineType(jline_type_t t);		virtual void SetLineJoin(jline_join_t t);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetLineStyle(jline_style_t t);		virtual void SetLineStyle(jline_style_t t);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetLineWidth(int size);		virtual void SetLineWidth(int size);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jline_type_t GetLineType();		virtual jline_join_t GetLineJoin();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jline_style_t GetLineStyle();		virtual jline_style_t GetLineStyle();
	/**		/**
	* \brief		* \brief
	*		*
	skipping to change at line 516		skipping to change at line 534
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawLine(int xp, int yp, int xf, int yf);		virtual void DrawLine(int xp, int yp, int xf, int yf);
	/**		/**
	* \brief		* \brief
	*		*
			* \param p Vertex array containing (x, y) coordinates of th
			e points of the bezier curve.
			* \param npoints Number of points in the vertex array. Mini
			mum number is 3.
			* \param interpolation Number of steps for the interpolatio
			n. Minimum number is 2.
			*
	*/		*/
	virtual void DrawBezierCurve(jpoint_t *points, int n_points) ;		virtual void DrawBezierCurve(jpoint_t *p, int npoints, int i nterpolation);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillRectangle(int x, int y, int w, int h);		virtual void FillRectangle(int xp, int yp, int wp, int hp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawRectangle(int x, int y, int w, int h);		virtual void DrawRectangle(int xp, int yp, int wp, int hp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillBevelRectangle(int x, int y, int w, int h, int dx = 10, int dy = 10);		virtual void FillBevelRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawBevelRectangle(int x, int y, int w, int h, int dx = 10, int dy = 10);		virtual void DrawBevelRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillRoundRectangle(int x, int y, int w, int h, int raio = 10);		virtual void FillRoundRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawRoundRectangle(int x, int y, int w, int h, int raio = 10);		virtual void DrawRoundRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillCircle(int xp, int yp, int raio);		virtual void FillCircle(int xp, int yp, int rp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawCircle(int xp, int yp, int raio);		virtual void DrawCircle(int xp, int yp, int rp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillArc(int xcp, int ycp, int rxp, int ryp, dou ble start_angle, double end_angle);		void FillEllipse(int xcp, int ycp, int rxp, int ryp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawArc(int xcp, int ycp, int rxp, int ryp, dou		void DrawEllipse(int xcp, int ycp, int rxp, int ryp);
	ble start_angle, double end_angle);
			/**
			* \brief
			*
			*/
			virtual void FillChord(int xcp, int ycp, int rxp, int ryp, d
			ouble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void DrawChord(int xcp, int ycp, int rxp, int ryp, d
			ouble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void FillArc(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void DrawArc(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void FillPie(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void DrawPie(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillTriangle(int x1, int y1, int x2, int y2, in t x3, int y3);		virtual void FillTriangle(int x1, int y1, int x2, int y2, in t x3, int y3);
	/**		/**
	* \brief		* \brief
	*		*
	skipping to change at line 619		skipping to change at line 677
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawGlyph(int symbol, int xp, int yp);		virtual void DrawGlyph(int symbol, int xp, int yp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int x, int y, int al pha = 0xff);		virtual bool DrawImage(std::string img, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int x, int y, int w, int h, int alpha = 0xff);		virtual bool DrawImage(std::string img, int x, int y, int w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int alpha = 0xff);		virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);		virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int x, int y, in t alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h, int alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JUSTIFY_HAL IGN);		virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JUSTIFY_HAL IGN);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawString(std::string s, int x, int y);		virtual void DrawString(std::string text, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawString(std::string full_text, int x, int y, int width, int height, jhorizontal_align_t halign = JUSTIFY_HALIGN, jverti cal_align_t valign = CENTER_VALIGN, bool clipped = true);		virtual void DrawString(std::string text, int x, int y, int width, int height, jhorizontal_align_t halign = JUSTIFY_HALIGN, jvertical_a lign_t valign = CENTER_VALIGN, bool clipped = true);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000);		virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000);
	/**		/**
	* \brief		* \brief
	*		*
End of changes. 36 change blocks.
	45 lines changed or deleted		116 lines changed or added

	jinetaddress.h		jinetaddress.h
	skipping to change at line 32		skipping to change at line 32
	#include "jobject.h"		#include "jobject.h"
	#include <string>		#include <string>
	#include <vector>		#include <vector>
	#include <cstring>		#include <cstring>
	#include <cstdlib>		#include <cstdlib>
	#ifdef _WIN32		#ifdef _WIN32
	#include <windows.h>		#include <windows.h>
	#elif __CYGWIN32__
	#include <netdb.h>
	#include <cygwin/socket.h>
	#include <arpa/inet.h>
	#else		#else
	#include <netdb.h>		#include <netdb.h>
	#include <arpa/inet.h>		#include <arpa/inet.h>
	#endif		#endif
	namespace jsocket {		namespace jsocket {
	/**		/**
	* \brief InetAddress.		* \brief InetAddress.
	*		*
End of changes. 1 change blocks.
	4 lines changed or deleted		0 lines changed or added

	jlistbox.h		jlistbox.h
	skipping to change at line 71		skipping to change at line 71
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class ListBox : public jgui::ItemComponent{		class ListBox : public jgui::ItemComponent{
	private:		private:
	jlist_scroll_type_t _scroll;		jlist_scroll_type_t _scroll;
	jlist_selection_type_t _selection;		jlist_selection_type_t _selection;
	int _item_size,		int _item_size,
	_top_index,		_top_index,
	_selected_index;		_selected_index,
	bool _input_locked,		_stone_size,
			_scroll_width;
			bool _pressed,
	_centered_interaction;		_centered_interaction;
	private:		private:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	void PreviousItem();		void PreviousItem();
	/**		/**
	skipping to change at line 105		skipping to change at line 107
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual ~ListBox();		virtual ~ListBox();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
			virtual int GetStoneSize();
			/**
			* \brief
			*
			*/
			virtual void SetStoneSize(int size);
			/**
			* \brief
			*
			*/
	virtual void SetCenteredInteraction(bool b);		virtual void SetCenteredInteraction(bool b);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetScrollType(jlist_scroll_type_t type);		virtual void SetScrollType(jlist_scroll_type_t type);
	/**		/**
	* \brief		* \brief
	skipping to change at line 214		skipping to change at line 228
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetForegroundFocusColor(int red, int green, int blue, int alpha);		virtual void SetForegroundFocusColor(int red, int green, int blue, int alpha);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool ProcessEvent(KeyEvent *event);		virtual jsize_t GetPreferredSize();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool ProcessEvent(MouseEvent *event);		virtual bool ProcessEvent(KeyEvent *event);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jsize_t GetPreferredSize();		virtual bool ProcessEvent(MouseEvent *event);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Paint(Graphics *g);		virtual void Paint(Graphics *g);
	};		};
	}		}
End of changes. 5 change blocks.
	5 lines changed or deleted		19 lines changed or added

	jmarquee.h		jmarquee.h
	skipping to change at line 61		skipping to change at line 61
	* \brief		* \brief
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class Marquee : public Component, public jthread::Thread{		class Marquee : public Component, public jthread::Thread{
	private:		private:
	std::string _text;		std::string _text;
	jmarquee_type_t _type;		jmarquee_type_t _type;
	int _position,		int _position,
	_delta,
	_interval,		_interval,
	_index;		_index,
			_step;
	bool _running;		bool _running;
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	Marquee(std::string text, int x = 0, int y = 0, int width = DEFAULT_COMPONENT_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT);		Marquee(std::string text, int x = 0, int y = 0, int width = DEFAULT_COMPONENT_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT);
	/**		/**
	skipping to change at line 95		skipping to change at line 95
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetType(jmarquee_type_t type);		virtual void SetType(jmarquee_type_t type);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
			virtual void SetStep(int i);
			/**
			* \brief
			*
			*/
	virtual void SetInterval(int i);		virtual void SetInterval(int i);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetText(std::string text);		virtual void SetText(std::string text);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual std::string GetText();		virtual std::string GetText();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Paint(Graphics *g);		virtual void Release();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Run();		virtual void Paint(Graphics *g);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Release();		virtual void Run();
	};		};
	}		}
	#endif		#endif
End of changes. 6 change blocks.
	5 lines changed or deleted		11 lines changed or added

	jmemory.h		jmemory.h
	skipping to change at line 26		skipping to change at line 26
	* along with this program; if not, write to the *		* along with this program; if not, write to the *
	* Free Software Foundation, Inc., *		* Free Software Foundation, Inc., *
	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *		* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
	************************************************************************** */		************************************************************************** */
	#ifndef J_MEMORY_H		#ifndef J_MEMORY_H
	#define J_MEMORY_H		#define J_MEMORY_H
	#include "jdevice.h"		#include "jdevice.h"
	#ifdef _WIN32		#ifdef _WIN32
	#elif __CYGWIN32__
	#else		#else
	#include <sys/sysinfo.h>		#include <sys/sysinfo.h>
	#endif		#endif
	namespace jphysic{		namespace jphysic{
	/**		/**
	* \brief		* \brief
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class Memory{		class Memory{
	private:		private:
	#ifdef _WIN32		#ifdef _WIN32
	#elif __CYGWIN32__
	#else		#else
	/** \brief */		/** \brief */
	struct sysinfo info;		struct sysinfo info;
	#endif		#endif
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
End of changes. 2 change blocks.
	2 lines changed or deleted		0 lines changed or added

	jmessagequeue.h		jmessagequeue.h
	skipping to change at line 43		skipping to change at line 43
	#define MAX_PACKET_SIZE 256		#define MAX_PACKET_SIZE 256
	namespace jshared {		namespace jshared {
	struct jpage_msg_t {		struct jpage_msg_t {
	long mtype;		long mtype;
	char msg[MAX_PACKET_SIZE];		char msg[MAX_PACKET_SIZE];
	};		};
	#ifdef __CYGWIN32__
	struct msgbuf {		struct msgbuf {
	int mtype;		int mtype;
	};		};
	#endif
	union msg_t {		union msg_t {
	#ifdef _WIN32		#ifdef _WIN32
	jpage_msg_t msg;		jpage_msg_t msg;
	#else		#else
	struct msgbuf buf;		struct msgbuf buf;
	jpage_msg_t msg;		jpage_msg_t msg;
	#endif		#endif
	};		};
End of changes. 2 change blocks.
	2 lines changed or deleted		0 lines changed or added

	jmouseevent.h		jmouseevent.h
	skipping to change at line 55		skipping to change at line 55
	JMOUSE_RELEASED_EVENT,		JMOUSE_RELEASED_EVENT,
	JMOUSE_MOVED_EVENT,		JMOUSE_MOVED_EVENT,
	JMOUSE_WHEEL_EVENT		JMOUSE_WHEEL_EVENT
	};		};
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	enum jmouse_button_t {		enum jmouse_button_t {
	JBUTTON_UNKNOWN = 0x0,		JMOUSE_UNKNOWN = 0x0,
	JBUTTON_BUTTON1 = 0x1,		JMOUSE_BUTTON1 = 0x1,
	JBUTTON_BUTTON2 = 0x2,		JMOUSE_BUTTON2 = 0x2,
	JBUTTON_BUTTON3 = 0x4,		JMOUSE_BUTTON3 = 0x4,
	JBUTTON_WHEEL = 0x08		JMOUSE_WHEEL = 0x08
	};		};
	/**		/**
	* \brief		* \brief
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class MouseEvent : public jcommon::EventObject{		class MouseEvent : public jcommon::EventObject{
	private:		private:
End of changes. 1 change blocks.
	5 lines changed or deleted		5 lines changed or added

	jnullgraphics.h		jnullgraphics.h
	skipping to change at line 59		skipping to change at line 59
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void * GetNativeSurface();		virtual void * GetNativeSurface();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
			static bool GetImageSize(std::string img, int *width, int *h
			eight);
			/**
			* \brief
			*
			*/
	virtual void SetNativeSurface(void *surface);		virtual void SetNativeSurface(void *surface);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetWorkingScreenSize(int width, int height);		virtual void SetWorkingScreenSize(int width, int height);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual OffScreenImage * Create();		virtual OffScreenImage * Create();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetClip(int x, int y, int width, int height);		virtual void Rotate(double radians);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jregion_t GetClip();		virtual void Translate(int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void ReleaseClip();		virtual double Rotate();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Rotate(double radians);		virtual jpoint_t Translate();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Translate(int x, int y);		virtual void SetClip(int x, int y, int width, int height);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual double Rotate();		virtual jregion_t GetClip();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jpoint_t Translate();		virtual void ReleaseClip();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Clear(int r = 0xff, int g = 0xff, int b = 0xff, int a = 0x00);		virtual void Clear(int r = 0xff, int g = 0xff, int b = 0xff, int a = 0x00);
	/**		/**
	* \brief		* \brief
	*		*
	skipping to change at line 149		skipping to change at line 155
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual struct jcolor_t GetColor();		virtual struct jcolor_t GetColor();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetColor(uint32_t color);		virtual void SetColor(struct jcolor_t c);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetColor(int r, int g, int b, int a = 0xFF);		virtual void SetColor(uint32_t c);
			/**
			* \brief
			*
			*/
			virtual void SetColor(int r, int g, int b, int a = 0xff);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool HasFont();		virtual bool HasFont();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetFont(Font *font);		virtual void SetFont(Font *font);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
			virtual Font * GetFont();
			/**
			* \brief
			*
			*/
			virtual void SetAntiAliasEnabled(bool b);
			/**
			* \brief
			*
			*/
			virtual jporter_duff_flags_t GetPorterDuffFlags();
			/**
			* \brief
			*
			*/
			virtual jdrawing_flags_t GetDrawingFlags();
			/**
			* \brief
			*
			*/
			virtual jblitting_flags_t GetBlittingFlags();
			/**
			* \brief
			*
			*/
	virtual void SetPorterDuffFlags(jporter_duff_flags_t t);		virtual void SetPorterDuffFlags(jporter_duff_flags_t t);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetDrawingFlags(jdrawing_flags_t t);		virtual void SetDrawingFlags(jdrawing_flags_t t);
	/**		/**
	* \brief		* \brief
	skipping to change at line 203		skipping to change at line 245
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual uint32_t GetPixel(int xp, int yp);		virtual uint32_t GetPixel(int xp, int yp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetLineType(jline_type_t t);		virtual void SetLineJoin(jline_join_t t);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetLineStyle(jline_style_t t);		virtual void SetLineStyle(jline_style_t t);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetLineWidth(int size);		virtual void SetLineWidth(int size);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jline_type_t GetLineType();		virtual jline_join_t GetLineJoin();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual jline_style_t GetLineStyle();		virtual jline_style_t GetLineStyle();
	/**		/**
	* \brief		* \brief
	*		*
	skipping to change at line 244		skipping to change at line 286
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawLine(int xp, int yp, int xf, int yf);		virtual void DrawLine(int xp, int yp, int xf, int yf);
	/**		/**
	* \brief		* \brief
	*		*
			* \param p Vertex array containing (x, y) coordinates of th
			e points of the bezier curve.
			* \param npoints Number of points in the vertex array. Mini
			mum number is 3.
			* \param interpolation Number of steps for the interpolatio
			n. Minimum number is 2.
			*
	*/		*/
	virtual void DrawBezierCurve(jpoint_t *points, int n_points) ;		virtual void DrawBezierCurve(jpoint_t *p, int npoints, int i nterpolation);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillRectangle(int x, int y, int w, int h);		virtual void FillRectangle(int xp, int yp, int wp, int hp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawRectangle(int x, int y, int w, int h);		virtual void DrawRectangle(int xp, int yp, int wp, int hp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillBevelRectangle(int x, int y, int w, int h, int dx = 10, int dy = 10);		virtual void FillBevelRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawBevelRectangle(int x, int y, int w, int h, int dx = 10, int dy = 10);		virtual void DrawBevelRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillRoundRectangle(int x, int y, int w, int h, int raio = 10);		virtual void FillRoundRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawRoundRectangle(int x, int y, int w, int h, int raio = 10);		virtual void DrawRoundRectangle(int xp, int yp, int wp, int hp, int dx = 10, int dy = 10);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillCircle(int xp, int yp, int raio);		virtual void FillCircle(int xp, int yp, int rp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawCircle(int xp, int yp, int raio);		virtual void DrawCircle(int xp, int yp, int rp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillArc(int xcp, int ycp, int rxp, int ryp, dou ble start_angle, double end_angle);		void FillEllipse(int xcp, int ycp, int rxp, int ryp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawArc(int xcp, int ycp, int rxp, int ryp, dou		void DrawEllipse(int xcp, int ycp, int rxp, int ryp);
	ble start_angle, double end_angle);
			/**
			* \brief
			*
			*/
			virtual void FillChord(int xcp, int ycp, int rxp, int ryp, d
			ouble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void DrawChord(int xcp, int ycp, int rxp, int ryp, d
			ouble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void FillArc(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void DrawArc(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void FillPie(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
			/**
			* \brief
			*
			*/
			virtual void DrawPie(int xcp, int ycp, int rxp, int ryp, dou
			ble arc0, double arc1);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillTriangle(int x1, int y1, int x2, int y2, in t x3, int y3);		virtual void FillTriangle(int x1, int y1, int x2, int y2, in t x3, int y3);
	/**		/**
	* \brief		* \brief
	*		*
	skipping to change at line 335		skipping to change at line 417
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawPolygon(int x, int y, jpoint_t *p, int num, bool close);		virtual void DrawPolygon(int x, int y, jpoint_t *p, int num, bool close);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void FillGradientRectangle(int x, int y, int w, int h, int sr, int sg, int sb, int sa, int dr, int dg, int db, int da = 0xFF, b ool horizontal = true);		virtual void FillGradientRectangle(int x, int y, int w, int h, jcolor_t scolor, jcolor_t dcolor, bool horizontal = true);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JUSTIFY_HAL IGN);		virtual void DrawGlyph(int symbol, int xp, int yp);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawString(std::string s, int x, int y);		virtual bool DrawImage(std::string img, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawString(std::string full_text, int x, int y, int width, int height, jhorizontal_align_t halign = JUSTIFY_HALIGN, jverti cal_align_t valign = CENTER_VALIGN, bool clipped = true);		virtual bool DrawImage(std::string img, int x, int y, int w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DrawGlyph(int symbol, int xp, int yp);		virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int x, int y, int al pha = 0xff);		virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int x, int y, int w, int h, int alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(std::string img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int x, int y, in t alpha = 0xff);		virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int x, int y, in t w, int h, int alpha = 0xff);		virtual void GetStringBreak(std::vector<std::string> *lines, std::string text, int wp, int hp, jhorizontal_align_t halign = JUSTIFY_HAL IGN);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int alpha = 0xff);		virtual void DrawString(std::string text, int x, int y);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool DrawImage(OffScreenImage *img, int sx, int sy, int sw, int sh, int x, int y, int w, int h, int alpha = 0xff);		virtual void DrawString(std::string text, int x, int y, int width, int height, jhorizontal_align_t halign = JUSTIFY_HALIGN, jvertical_a lign_t valign = CENTER_VALIGN, bool clipped = true);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000);		virtual uint32_t GetRGB(int xp, int yp, uint32_t pixel = 0xf f000000);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void GetRGBArray(int startxp, int startyp, int width p, int heightp, uint32_t **rgb, int offset, int scansize);		virtual void GetRGBArray(int startxp, int startyp, int width p, int heightp, uint32_t **rgb, int offset, int scansize);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetRGB(int xp, int yp, int rgb);		virtual void SetRGB(int xp, int yp, uint32_t rgb);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetRGB(uint32_t *rgb, int x, int y, int w, int h, int scanline);		virtual void SetRGB(uint32_t *rgb, int xp, int yp, int wp, i nt hp, int scanline);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Reset();		virtual void Reset();
			/**
			* \brief
			*
			*/
			virtual void Lock();
			/**
			* \brief
			*
			*/
			virtual void Unlock();
	};		};
	}		}
	#endif		#endif
End of changes. 41 change blocks.
	38 lines changed or deleted		141 lines changed or added

	jprogressbar.h		jprogressbar.h
	skipping to change at line 53		skipping to change at line 53
	/**		/**
	* \brief		* \brief
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class ProgressBar : public jgui::Component, public jthread::Thread{		class ProgressBar : public jgui::Component, public jthread::Thread{
	private:		private:
	jprogress_type_t _type;		jprogress_type_t _type;
	double _position;		int _value,
	int _index,		_index,
	_delta,		_delta,
	_fixe_delta;		_fixe_delta;
	bool _label_visible,		bool _label_visible,
	_indeterminate,		_indeterminate,
	_running;		_running;
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	ProgressBar(int x = 0, int y = 0, int width = DEFAULT_COMPON ENT_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT, jprogress_type_t type = L EFT_RIGHT_DIRECTION);		ProgressBar(int x = 0, int y = 0, int width = DEFAULT_COMPON ENT_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT, jprogress_type_t type = L EFT_RIGHT_DIRECTION);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual ~ProgressBar();		virtual ~ProgressBar();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual double GetPosition();		virtual double GetValue();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetPosition(double i);		virtual void SetValue(double i);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetStringPainted(bool b);		virtual void SetStringPainted(bool b);
	/**		/**
	* \brief		* \brief
	*		*
End of changes. 4 change blocks.
	8 lines changed or deleted		8 lines changed or added

	jschedule.h		jschedule.h
	skipping to change at line 60		skipping to change at line 60
	/**		/**
	* \brief Prioridade do escalonamento		* \brief Prioridade do escalonamento
	*		*
	*/		*/
	enum jschedule_type_t {		enum jschedule_type_t {
	#ifdef _WIN32		#ifdef _WIN32
	PRIORITY_PROCESS = 0,		PRIORITY_PROCESS = 0,
	PRIORITY_GROUP = 0,		PRIORITY_GROUP = 0,
	PRIORITY_USER = 0		PRIORITY_USER = 0
	#elif __CYGWIN32__
	PRIORITY_PROCESS = 0,
	PRIORITY_GROUP = 0,
	PRIORITY_USER = 0
	#else		#else
	PRIORITY_PROCESS = PRIO_PROCESS,		PRIORITY_PROCESS = PRIO_PROCESS,
	PRIORITY_GROUP = PRIO_PGRP,		PRIORITY_GROUP = PRIO_PGRP,
	PRIORITY_USER = PRIO_USER		PRIORITY_USER = PRIO_USER
	#endif		#endif
	};		};
	/**		/**
	* \brief Parametros de escalonamento		* \brief Parametros de escalonamento
	*		*
End of changes. 1 change blocks.
	4 lines changed or deleted		0 lines changed or added

	jscrollbar.h		jscrollbar.h
	skipping to change at line 23		skipping to change at line 23
	* GNU General Public License for more details. *		* GNU General Public License for more details. *
	* *		* *
	* You should have received a copy of the GNU General Public License *		* You should have received a copy of the GNU General Public License *
	* along with this program; if not, write to the *		* along with this program; if not, write to the *
	* Free Software Foundation, Inc., *		* Free Software Foundation, Inc., *
	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *		* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
	************************************************************************** */		************************************************************************** */
	#ifndef J_SCROLLBAR_H		#ifndef J_SCROLLBAR_H
	#define J_SCROLLBAR_H		#define J_SCROLLBAR_H
	#include "jcomponent.h"		#include "jslidercomponent.h"
	#include "jadjustmentlistener.h"
	#include <string>		#include <string>
	#include <stdlib.h>		#include <stdlib.h>
	namespace jgui {		namespace jgui {
	/**		/**
	* \brief		* \brief
	*		*
	*/
	enum jscroll_orientation_t {
	LEFT_RIGHT_SCROLL,
	BOTTOM_UP_SCROLL
	};
	/**
	* \brief
	*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class ScrollBar : public jgui::Component{		class ScrollBar : public jgui::SliderComponent{
	private:		private:
	std::vector<AdjustmentListener *> _adjust_listeners;		std::vector<AdjustmentListener *> _adjust_listeners;
	double _position,
	_minimum_tick,
	_maximum_tick,
	_old_position;
	int _index,		int _index,
	_stone_size,		_stone_size,
	_count_paint;		_count_paint;
	bool _label_visible,		bool _pressed,
	_indeterminate,		_label_visible;
	_running;
	jscroll_orientation_t _type;
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	ScrollBar(int x = 0, int y = 0, int width = DEFAULT_COMPONEN T_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT);		ScrollBar(int x = 0, int y = 0, int width = DEFAULT_COMPONEN T_WIDTH, int height = DEFAULT_COMPONENT_HEIGHT);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual ~ScrollBar();		virtual ~ScrollBar();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetOrientation(jscroll_orientation_t type);
	/**
	* \brief
	*
	*/
	virtual jscroll_orientation_t GetOrientation();
	/**
	* \brief
	*
	*/
	virtual void SetStoneSize(int size);
	/**
	* \brief
	*
	*/
	virtual int GetStoneSize();		virtual int GetStoneSize();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual double GetPosition();		virtual void SetStoneSize(int size);
	/**
	* \brief
	*
	*/
	virtual double GetMinorTickSpacing();
	/**
	* \brief
	*
	*/
	virtual double GetMajorTickSpacing();
	/**
	* \brief
	*
	*/
	virtual void SetPosition(double i);
	/**
	* \brief
	*
	*/
	virtual void SetMinorTickSpacing(double i);
	/**
	* \brief
	*
	*/
	virtual void SetMajorTickSpacing(double i);
	/**
	* \brief
	*
	*/
	virtual void RegisterAdjustmentListener(AdjustmentListener *
	listener);
	/**
	* \brief
	*
	*/
	virtual void RemoveAdjustmentListener(AdjustmentListener *li
	stener);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void DispatchAdjustmentEvent(AdjustmentEvent *event) ;		virtual bool ProcessEvent(KeyEvent *event);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual std::vector<AdjustmentListener *> & GetAdjustmentLis teners();		virtual bool ProcessEvent(MouseEvent *event);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Paint(Graphics *g);		virtual void Paint(Graphics *g);
	/**
	* \brief
	*
	*/
	virtual bool ProcessEvent(KeyEvent *event);
	/**
	* \brief
	*
	*/
	virtual bool ProcessEvent(MouseEvent *event);
	};		};
	}		}
	#endif		#endif
End of changes. 10 change blocks.
	97 lines changed or deleted		7 lines changed or added

	jslider.h		jslider.h
	skipping to change at line 23		skipping to change at line 23
	* GNU General Public License for more details. *		* GNU General Public License for more details. *
	* *		* *
	* You should have received a copy of the GNU General Public License *		* You should have received a copy of the GNU General Public License *
	* along with this program; if not, write to the *		* along with this program; if not, write to the *
	* Free Software Foundation, Inc., *		* Free Software Foundation, Inc., *
	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *		* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
	************************************************************************** */		************************************************************************** */
	#ifndef J_SLIDER_H		#ifndef J_SLIDER_H
	#define J_SLIDER_H		#define J_SLIDER_H
	#include "jcomponent.h"		#include "jslidercomponent.h"
	#include "jscrollbar.h"
	#include "jadjustmentlistener.h"
	#include <string>		#include <string>
	#include <stdlib.h>		#include <stdlib.h>
	namespace jgui {		namespace jgui {
	/**		/**
	* \brief		* \brief
	*		*
	* \author Jeff Ferr		* \author Jeff Ferr
	*/		*/
	class Slider : public jgui::Component{		class Slider : public jgui::SliderComponent{
	private:		private:
	std::vector<AdjustmentListener *> _adjust_listeners;		int _stone_size;
	double _position,		bool _pressed,
	_minimum_tick,		_inverted;
	_maximum_tick,
	_old_position;
	int _index,
	_delta,
	_fixe_delta,
	_count_paint,
	_stone_size;
	bool _label_visible,
	_indeterminate,
	_running,
	_inverted;
	jscroll_orientation_t _type;
	public:		public:
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	Slider(int x = 0, int y = 0, int width = DEFAULT_COMPONENT_W IDTH, int height = DEFAULT_COMPONENT_HEIGHT);		Slider(int x = 0, int y = 0, int width = DEFAULT_COMPONENT_W IDTH, int height = DEFAULT_COMPONENT_HEIGHT);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual ~Slider();		virtual ~Slider();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetStoneSize(int size);		virtual int GetStoneSize();
	/**
	* \brief
	*
	*/
	virtual void SetOrientation(jscroll_orientation_t type);
	/**
	* \brief
	*
	*/
	virtual double GetPosition();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetPosition(double i);		virtual void SetStoneSize(int size);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void SetInverted(bool b);		virtual void SetInverted(bool b);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual double GetMinorTickSpacing();
	/**
	* \brief
	*
	*/
	virtual double GetMajorTickSpacing();
	/**
	* \brief
	*
	*/
	virtual void SetMinorTickSpacing(double i);
	/**
	* \brief
	*
	*/
	virtual void SetMajorTickSpacing(double i);
	/**
	* \brief
	*
	*/
	virtual bool ProcessEvent(KeyEvent *event);		virtual bool ProcessEvent(KeyEvent *event);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual bool ProcessEvent(MouseEvent *event);		virtual bool ProcessEvent(MouseEvent *event);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Paint(Graphics *g);		virtual void Paint(Graphics *g);
	/**
	* \brief
	*
	*/
	virtual void RegisterAdjustmentListener(AdjustmentListener *
	listener);
	/**
	* \brief
	*
	*/
	virtual void RemoveAdjustmentListener(AdjustmentListener *li
	stener);
	/**
	* \brief
	*
	*/
	virtual void DispatchAdjustmentEvent(AdjustmentEvent *event)
	;
	/**
	* \brief
	*
	*/
	virtual std::vector<AdjustmentListener *> & GetAdjustmentLis
	teners();
	};		};
	}		}
	#endif		#endif
End of changes. 7 change blocks.
	84 lines changed or deleted		7 lines changed or added

	jwindow.h		jwindow.h
	skipping to change at line 219		skipping to change at line 219
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void Repaint(Component *c, int x, int y, int width, int height);		virtual void Repaint(Component *c, int x, int y, int width, int height);
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
			virtual void Paint(Graphics *g);
			/**
			* \brief
			*
			*/
	virtual void ReleaseWindow();		virtual void ReleaseWindow();
	/**		/**
	* \brief		* \brief
	*		*
	*/		*/
	virtual void RaiseToTop();		virtual void RaiseToTop();
	/**		/**
	* \brief		* \brief
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/