From 040af6e4484da682cfa594c1a71f66929d110e14 Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Sun, 18 May 2014 22:54:16 -0700 Subject: [PATCH] Revert "Midstream on #8 : Reverted to using ImageDisplay and cut out the properties change event handler, to show how it looks before getting horked up" This reverts commit f6f635a5839a15054f3c812ea4ea37566a0bf426. --- lib/tailor/GUI/TilesetEditor.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/tailor/GUI/TilesetEditor.rb b/lib/tailor/GUI/TilesetEditor.rb index 74e8909..69b38b2 100644 --- a/lib/tailor/GUI/TilesetEditor.rb +++ b/lib/tailor/GUI/TilesetEditor.rb @@ -18,8 +18,7 @@ module Tailor tmpversizer = Wx::BoxSizer.new(Wx::VERTICAL) @tilesetProperties = Tailor::GUI::TilesetProperties.new(@panel, Wx::ID_ANY) - #evt_tileprops_changed(@tilesetProperties) { |event| on_tilepropsChanged(event) } - + evt_tileprops_changed(@tilesetProperties) { |event| on_tilepropsChanged(event) } tmpversizer.add(@tilesetProperties, 0, flag = Wx::EXPAND|Wx::ALL) @cancelBtn = Wx::Button.new(@panel, Wx::ID_ANY, "Cancel") evt_button(@cancelBtn.get_id()) { |event| on_CancelClicked(event) } @@ -42,8 +41,7 @@ module Tailor tmpversizer.add(@cancelBtn, 0, flag=Wx::EXPAND) rowsizer.add(tmpversizer, 0, flag = Wx::EXPAND|Wx::ALL) - #@tilesetSlicer = Tailor::GUI::GridDisplay.new(@panel, Wx::ID_ANY) - @tilesetSlicer = Tailor::GUI::ImageDisplay.new(@panel, Wx::ID_ANY) + @tilesetSlicer = Tailor::GUI::GridDisplay.new(@panel, Wx::ID_ANY) @tilesetSlicer.set_min_size(Wx::Size.new(320, 240)) rowsizer.add(@tilesetSlicer, 1, flag = Wx::EXPAND|Wx::ALL)