Too many changes between last commit and here. I forgot that

[ttedit] / src / ttedit.h

diff --git a/src/ttedit.h b/src/ttedit.h
index de526f880b9280cfef86516ac075aa4a93f860df..7f1eba7da80992e2e1d76a1da95bde172d3cdce5 100755 (executable)
--- a/src/ttedit.h
+++ b/src/ttedit.h
@@ -2,7 +2,7 @@
 // TTEDIT.H: Header file\r
 //\r
 // by James L. Hammons\r
-// (C) 2005 Underground Software\r
+// (C) 2008 Underground Software\r
 //\r
 \r
 #ifndef __TTEDIT_H__\r
@@ -29,9 +29,11 @@ class TTEditApp: public wxApp
                CharWindow * charWin;\r
                ToolWindow * toolPalette;\r
                TTF font;\r
+               wxCursor * cur[8];\r
 \r
                bool OnInit();\r
                int OnExit();\r
+               void CreateResources(void);\r
 };\r
 \r
 DECLARE_APP(TTEditApp)\r
@@ -51,131 +53,11 @@ class TTEditFrame: public wxFrame
                ~TTEditFrame(void);\r
 \r
                void OnCloseWindow(wxCloseEvent &e);\r
-\r
                void OnOpen(wxCommandEvent &e);\r
                void OnExit(wxCommandEvent &e);\r
                void OnAbout(wxCommandEvent &e);\r
-//             void OnEasy(wxCommandEvent &event);\r
-///            void OnMedium(wxCommandEvent &event);\r
-//             void OnDifficult(wxCommandEvent &event);\r
-\r
-       DECLARE_EVENT_TABLE()\r
-};\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
-\r
-       protected:\r
-       public:\r
-//             int field_width, field_height;\r
-//             int x_cell, y_cell;\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
-//             void DrawField(wxDC *, int xc1, int yc1, int xc2, int yc2);\r
-//             void Refresh(int xc1, int yc1, int xc2, int yc2);\r
-//             void Uncover(int x, int y);\r
-//             void UpdateFieldSize();\r
-\r
-       protected:\r
-               wxPoint GetAdjustedMousePosition(wxMouseEvent &e);\r
-               wxPoint GetAdjustedClientPosition(wxCoord x, wxCoord y);\r
-\r
-       DECLARE_EVENT_TABLE()\r
-};\r
-\r
-class CharWindow: public wxWindow\r
-{\r
-       private:\r
-       protected:\r
-       public:\r
-//             int field_width, field_height;\r
-//             int x_cell, y_cell;\r
-               wxBitmap * bmp;\r
-\r
-               // Constructor and destructor\r
-               CharWindow(wxFrame * parent, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0);\r
-               ~CharWindow(void);\r
-\r
-               void OnPaint(wxPaintEvent &e);\r
-               void OnMouseEvent(wxMouseEvent &e);\r
-//             void DrawField(wxDC *, int xc1, int yc1, int xc2, int yc2);\r
-//             void Refresh(int xc1, int yc1, int xc2, int yc2);\r
-//             void Uncover(int x, int y);\r
-//             void UpdateFieldSize();\r
 \r
        DECLARE_EVENT_TABLE()\r
 };\r
 \r
-class ToolWindow: public wxFrame\r
-//class ToolWindow: public wxWindow\r
-{\r
-       private:\r
-       protected:\r
-       public:\r
-               wxBitmap * bmp;\r
-               wxPoint sizeStamp, sizeTPBM;\r
-               int prevTool;\r
-\r
-               // Constructor and destructor\r
-               ToolWindow(wxFrame * parent, const wxString &title, const wxPoint &pos, const wxSize &size, long style);\r
-//             ToolFrame(wxFrame * parent, const wxString &title, const wxPoint &pos, const wxSize &size, long style);\r
-//             ToolWindow(wxFrame * parent, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0);\r
-               ~ToolWindow(void);\r
-\r
-               void OnPaint(wxPaintEvent &e);\r
-               void OnMouseEvent(wxMouseEvent &e);\r
-//             void DrawField(wxDC *, int xc1, int yc1, int xc2, int yc2);\r
-//             void Refresh(int xc1, int yc1, int xc2, int yc2);\r
-//             void Uncover(int x, int y);\r
-//             void UpdateFieldSize();\r
-               int32 FindSelectedTool(void);\r
-\r
-       DECLARE_EVENT_TABLE()\r
-};\r
-\r
-// Resource/control IDs\r
-/*\r
-#define        IDI_ICON                        0x01L           // IDs same as in ttedit.asm\r
-#define        IDM_MENU                        0x02L\r
-#define        IDA_ACCEL                       0x03L\r
-#define        IDD_ABOUT                       0x04L\r
-#define IDR_TOOLBAR1           0x05L\r
-#define IDB_TOOLBAR1           0x06L\r
-#define IDB_TOOLPAL1           0x07L\r
-#define IDC_CURSOR1                    0x08L\r
-#define IDC_CURSOR2                    0x09L\r
-#define IDC_CURSOR3                    0x0AL\r
-#define IDC_CURSOR4                    0x0BL\r
-#define IDC_CURSOR5                    0x0CL\r
-#define IDC_CURSOR6                    0x0DL\r
-#define IDC_CURSOR7                    0x0EL\r
-#define IDC_CURSOR8                    0x0FL\r
-\r
-#define        IDS_SYSMENU                     0x010L\r
-#define        IDM_FILEMENU            0x011L\r
-#define        IDM_HELPMENU            0x012L\r
-\r
-#define        IDM_NEW                         0x020L\r
-#define        IDM_OPEN                        0x021L\r
-#define        IDM_SAVE                        0x022L\r
-#define        IDM_SAVEAS                      0x023L\r
-#define        IDM_EXIT                        0x024L\r
-#define        IDM_HELPTOPICS          0x025L\r
-#define        IDM_ABOUT                       0x026L\r
-\r
-#define        ID_TBLEFT                       0x030L\r
-#define        ID_TBRIGHT                      0x031L\r
-#define        ID_TBCHARWIN            0x032L */\r
-\r
 #endif // __TTEDIT_H__\r