X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Feditwindow.h;h=1b24dde34c675dd8cb32bd5c11ad617169f6cf75;hb=29b571499a38273c6c693334512e44f4162171a5;hp=846e891608342f6084855e7b8d5c83bb9f94dd60;hpb=c84263bb8b0d16e4c6da49aa0b7d0bc904ae02b1;p=ttedit

diff --git a/src/editwindow.h b/src/editwindow.h
index 846e891..1b24dde 100755
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -8,17 +8,33 @@
 #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 <QtGui>
 #include "types.h"
-#include "ttedit.h"								// For TTEditApp
 #include "toolwindow.h"							// For ToolType enum
 #include "glyphpoints.h"
 
-class TTEditWindow: public wxWindow
+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:
-		TTEditApp & app;						// Reference to the application object
+		void CreateCursors(void);
+		QPoint GetAdjustedMousePosition(QMouseEvent * event);
+		QPoint GetAdjustedClientPosition(int x, int y);
+
+		QImage image;
+		QPoint pt, ptOffset, ptPrevious;
 		double scale;							// Window scaling factor
 		int32 offsetX, offsetY;					// Window offsets
 		ToolType tool;							// Current tool
@@ -26,23 +42,8 @@ class TTEditWindow: public wxWindow
 		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()
+		ToolWindow * toolPalette;
+		QCursor cur[8];
 };
 
 #endif	// __EDITWINDOW_H__