diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-15 23:24:22 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-15 23:24:22 -0400 |
commit | 213cab3c04b81428ab715f340bd7c12438fdb980 (patch) | |
tree | 295d25eac4b94357ac5b9bb4b3fd03130181b956 /tools/mapedit/src/frame.h | |
parent | 25240241e91dc913d20fbb93aa4acc9433dda6a0 (diff) | |
download | therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.gz therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.bz2 therapy-213cab3c04b81428ab715f340bd7c12438fdb980.zip |
Map editor can now add entities to maps
Also fixed a big bug regarding scrolling
Diffstat (limited to 'tools/mapedit/src/frame.h')
-rw-r--r-- | tools/mapedit/src/frame.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/mapedit/src/frame.h b/tools/mapedit/src/frame.h index 5e119f3..cb29480 100644 --- a/tools/mapedit/src/frame.h +++ b/tools/mapedit/src/frame.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #include "widget.h" | 11 | #include "widget.h" |
12 | #include "tile_widget.h" | 12 | #include "tile_widget.h" |
13 | #include <list> | 13 | #include <list> |
14 | #include <wx/notebook.h> | ||
14 | 15 | ||
15 | class MapeditFrame : public wxFrame { | 16 | class MapeditFrame : public wxFrame { |
16 | public: | 17 | public: |
@@ -18,6 +19,7 @@ class MapeditFrame : public wxFrame { | |||
18 | MapeditFrame(Map map, std::string filename); | 19 | MapeditFrame(Map map, std::string filename); |
19 | 20 | ||
20 | MapeditWidget* GetMapEditor(); | 21 | MapeditWidget* GetMapEditor(); |
22 | void FinishAddingEntity(); | ||
21 | 23 | ||
22 | static void NewMap(); | 24 | static void NewMap(); |
23 | static void OpenMap(const char* filename); | 25 | static void OpenMap(const char* filename); |
@@ -36,12 +38,22 @@ class MapeditFrame : public wxFrame { | |||
36 | void OnExit(wxCloseEvent& event); | 38 | void OnExit(wxCloseEvent& event); |
37 | void OnQuit(wxCommandEvent& event); | 39 | void OnQuit(wxCommandEvent& event); |
38 | void OnTitleChange(wxCommandEvent& event); | 40 | void OnTitleChange(wxCommandEvent& event); |
41 | void OnTabChange(wxBookCtrlEvent& event); | ||
42 | void OnTabChanging(wxBookCtrlEvent& event); | ||
43 | void OnAddEntity(wxCommandEvent& event); | ||
44 | void OnCancelAddEntity(wxCommandEvent& event); | ||
39 | 45 | ||
40 | Map map; | 46 | Map map; |
41 | MapeditWidget* mapEditor; | 47 | MapeditWidget* mapEditor; |
42 | TileWidget* tileEditor; | 48 | TileWidget* tileEditor; |
43 | wxTextCtrl* titleBox; | 49 | wxTextCtrl* titleBox; |
44 | std::string filename; | 50 | std::string filename; |
51 | wxNotebook* notebook; | ||
52 | wxChoice* entityTypeBox; | ||
53 | wxButton* addEntityButton; | ||
54 | wxButton* cancelEntityButton; | ||
55 | |||
56 | bool addingEntity = false; | ||
45 | 57 | ||
46 | wxDECLARE_EVENT_TABLE(); | 58 | wxDECLARE_EVENT_TABLE(); |
47 | }; | 59 | }; |