From 8702c11db08f78b6c91ef950ce280f2289b1a6e6 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 15 Mar 2015 15:50:04 -0400 Subject: Added scrolling and zooming to map editor --- tools/mapedit/src/tile_widget.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools/mapedit/src/tile_widget.h') diff --git a/tools/mapedit/src/tile_widget.h b/tools/mapedit/src/tile_widget.h index 6d65f7b..f4bbc07 100644 --- a/tools/mapedit/src/tile_widget.h +++ b/tools/mapedit/src/tile_widget.h @@ -7,10 +7,12 @@ #include #endif -class TileWidget : public wxControl { +#include "map.h" + +class TileWidget : public wxScrolledWindow { public: TileWidget(); - TileWidget(wxWindow* parent, wxWindowID winid, int numTilesWidth = 8, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); + TileWidget(wxWindow* parent, wxWindowID winid, int width, int scale, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); int getSelected(); @@ -22,8 +24,9 @@ class TileWidget : public wxControl { private: int numTilesWidth; wxBitmap tiles; - int numTiles; + int numTiles = 50; int selected = 0; + int scale; DECLARE_DYNAMIC_CLASS(MapeditWidget); DECLARE_EVENT_TABLE(); -- cgit 1.4.1