diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-12 16:53:30 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-12 16:53:30 -0500 |
| commit | 3df19e45e737a1b9395a9a258e3263e444ebedd7 (patch) | |
| tree | 896adccf14054cf54291c1d5bc7825a8888a351b /tools/mapedit/src/frame.cpp | |
| parent | 5cc80ec58ea5bd66456f6f5286fa5f26d3fe702b (diff) | |
| parent | bc63fa57ced1c7329f7fdcfd168eaf7e290158bc (diff) | |
| download | therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.tar.gz therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.tar.bz2 therapy-3df19e45e737a1b9395a9a258e3263e444ebedd7.zip | |
Merge branch 'master' into es-rewrite
Diffstat (limited to 'tools/mapedit/src/frame.cpp')
| -rw-r--r-- | tools/mapedit/src/frame.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
| diff --git a/tools/mapedit/src/frame.cpp b/tools/mapedit/src/frame.cpp index aad3294..7112102 100644 --- a/tools/mapedit/src/frame.cpp +++ b/tools/mapedit/src/frame.cpp | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | static std::list<wxWindow*> openWindows; | 15 | static std::list<wxWindow*> openWindows; |
| 16 | 16 | ||
| 17 | enum { | 17 | enum { |
| 18 | IGNORE, | ||
| 18 | MENU_VIEW_ZOOM_IN, | 19 | MENU_VIEW_ZOOM_IN, |
| 19 | MENU_VIEW_ZOOM_OUT, | 20 | MENU_VIEW_ZOOM_OUT, |
| 20 | MENU_FILE_NEW, | 21 | MENU_FILE_NEW, |