Separated out app object, added character window.

[ttedit] / src / editwindow.h

diff --git a/src/editwindow.h b/src/editwindow.h
index f31298cc1305d5d041d200d6a1806194e11ec4a9..1b24dde34c675dd8cb32bd5c11ad617169f6cf75 100755 (executable)
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -10,7 +10,6 @@
 
 #include <QtGui>
 #include "types.h"
-//#include "ttedit.h"                                                          // For TTEditApp
 #include "toolwindow.h"                                                        // For ToolType enum
 #include "glyphpoints.h"
 
@@ -36,7 +35,6 @@ class EditWindow: public QWidget
 
                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
@@ -48,43 +46,4 @@ class EditWindow: public QWidget
                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__