Separated out app object, added character window.

[ttedit] / src / editwindow.h

diff --git a/src/editwindow.h b/src/editwindow.h
index 8034d7e27245aa1e2829240417008370be30fea8..1b24dde34c675dd8cb32bd5c11ad617169f6cf75 100755 (executable)
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -1,52 +1,49 @@
-//\r
-// EDITWINDOW.H: Header file\r
-//\r
-// by James L. Hammons\r
-// (C) 2008 Underground Software\r
-//\r
-\r
-#ifndef __EDITWINDOW_H__\r
-#define __EDITWINDOW_H__\r
-\r
-#include <wx/wx.h>                                                             // So that whoever uses this can without having\r
-                                                                                               // to pull in a bunch of references manually\r
-#include "types.h"\r
-#include "ttedit.h"                                                            // For TTEditApp\r
-#include "toolwindow.h"                                                        // For ToolType enum\r
-#include "glyphpoints.h"\r
-\r
-class TTEditWindow: public wxWindow\r
-{\r
-       private:\r
-               TTEditApp & app;                                                // Reference to the application object\r
-               double scale;                                                   // Window scaling factor\r
-               int32 offsetX, offsetY;                                 // Window offsets\r
-               ToolType tool;                                                  // Current tool\r
-               GlyphPoints pts;                                                // Glyph point structure\r
-               int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;\r
-               bool polyFirstPoint;\r
-\r
-       protected:\r
-       public:\r
-               wxBitmap * bmp;\r
-               wxPoint pt, ptOffset, ptPrevious;\r
-\r
-               // Constructor and destructor\r
-               TTEditWindow(wxFrame * parent, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0);\r
-               ~TTEditWindow(void);\r
-\r
-               void OnPaint(wxPaintEvent &e);\r
-               void OnMouseEvent(wxMouseEvent &e);\r
-\r
-       protected:\r
-               wxPoint GetAdjustedMousePosition(wxMouseEvent &e);\r
-               wxPoint GetAdjustedClientPosition(wxCoord x, wxCoord y);\r
-               void DrawRoundDot(wxDC &, int32, int32);\r
-               void DrawSquareDot(wxDC &, int32, int32);\r
-               void DrawRoundDotN(wxDC &, int32, int32, uint32);\r
-               void DrawSquareDotN(wxDC &, int32, int32, uint32);\r
-\r
-       DECLARE_EVENT_TABLE()\r
-};\r
-\r
-#endif // __EDITWINDOW_H__\r
+//
+// EDITWINDOW.H: Header file
+//
+// by James L. Hammons
+// (C) 2008 Underground Software
+//
+
+#ifndef __EDITWINDOW_H__
+#define __EDITWINDOW_H__
+
+#include <QtGui>
+#include "types.h"
+#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;
+               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];
+};
+
+#endif // __EDITWINDOW_H__