X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Feditwindow.h;h=f31298cc1305d5d041d200d6a1806194e11ec4a9;hb=3599953dec39d0ae662b039378a0b3eda39424e8;hp=4d0a9319725a316d11a0a294d04004b1630fe889;hpb=5c7c36b21d0f2a88accd8ff12c05dcc3004ce0e8;p=ttedit

diff --git a/src/editwindow.h b/src/editwindow.h
index 4d0a931..f31298c 100755
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -1,48 +1,90 @@
-//
-// EDITWINDOW.H: Header file
-//
-// by James L. Hammons
-// (C) 2008 Underground Software
-//
-
-#ifndef __EDITWINDOW_H__
-#define __EDITWINDOW_H__
-
-#include <wx/wx.h>								// So that whoever uses this can without having
-												// to pull in a bunch of references manually
-#include "types.h"
-#include "ttedit.h"								// For TTEditApp
-#include "toolwindow.h"							// For ToolType enum
-#include "glyphpoints.h"
-
-class TTEditWindow: public wxWindow
-{
-	private:
-		TTEditApp & app;						// Reference to the application object
-		double scale;							// Window scaling factor
-		int32 offsetX, offsetY;					// Window offsets
-		ToolType tool;							// Current tool
-		GlyphPoints pts;						// Glyph point structure
-		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-		bool polyFirstPoint;
-
-	protected:
-	public:
-		wxBitmap * bmp;
-		wxPoint pt, ptOffset, ptPrevious;
-
-		// Constructor and destructor
-		TTEditWindow(wxFrame * parent, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0);
-		~TTEditWindow(void);
-
-		void OnPaint(wxPaintEvent &e);
-		void OnMouseEvent(wxMouseEvent &e);
-
-	protected:
-		wxPoint GetAdjustedMousePosition(wxMouseEvent &e);
-		wxPoint GetAdjustedClientPosition(wxCoord x, wxCoord y);
-
-	DECLARE_EVENT_TABLE()
-};
-
-#endif	// __EDITWINDOW_H__
+//
+// EDITWINDOW.H: Header file
+//
+// by James L. Hammons
+// (C) 2008 Underground Software
+//
+
+#ifndef __EDITWINDOW_H__
+#define __EDITWINDOW_H__
+
+#include <QtGui>
+#include "types.h"
+//#include "ttedit.h"								// For TTEditApp
+#include "toolwindow.h"							// For ToolType enum
+#include "glyphpoints.h"
+
+class EditWindow: public QWidget
+{
+	Q_OBJECT
+
+	public:
+		EditWindow(QWidget * parent = NULL);
+		QSize minimumSizeHint() const;
+		QSize sizeHint() const;
+
+	protected:
+		void paintEvent(QPaintEvent * event);
+		void mousePressEvent(QMouseEvent * event);
+		void mouseMoveEvent(QMouseEvent * event);
+		void mouseReleaseEvent(QMouseEvent * event);
+
+	private:
+		void CreateCursors(void);
+		QPoint GetAdjustedMousePosition(QMouseEvent * event);
+		QPoint GetAdjustedClientPosition(int x, int y);
+
+		QImage image;
+		QPoint pt, ptOffset, ptPrevious;
+//		TTEditApp & app;						// Reference to the application object
+		double scale;							// Window scaling factor
+		int32 offsetX, offsetY;					// Window offsets
+		ToolType tool;							// Current tool
+		GlyphPoints pts;						// Glyph point structure
+		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+		bool polyFirstPoint;
+
+		ToolWindow * toolPalette;
+		QCursor cur[8];
+};
+
+#if 0
+#include <wx/wx.h>								// So that whoever uses this can without having
+												// to pull in a bunch of references manually
+#include "types.h"
+#include "ttedit.h"								// For TTEditApp
+#include "toolwindow.h"							// For ToolType enum
+#include "glyphpoints.h"
+
+class TTEditWindow: public wxWindow
+{
+	private:
+		TTEditApp & app;						// Reference to the application object
+		double scale;							// Window scaling factor
+		int32 offsetX, offsetY;					// Window offsets
+		ToolType tool;							// Current tool
+		GlyphPoints pts;						// Glyph point structure
+		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+		bool polyFirstPoint;
+
+	protected:
+	public:
+		wxBitmap * bmp;
+		wxPoint pt, ptOffset, ptPrevious;
+
+		// Constructor and destructor
+		TTEditWindow(wxFrame * parent, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0);
+		~TTEditWindow(void);
+
+		void OnPaint(wxPaintEvent &e);
+		void OnMouseEvent(wxMouseEvent &e);
+
+	protected:
+		wxPoint GetAdjustedMousePosition(wxMouseEvent &e);
+		wxPoint GetAdjustedClientPosition(wxCoord x, wxCoord y);
+
+	DECLARE_EVENT_TABLE()
+};
+#endif
+
+#endif	// __EDITWINDOW_H__