Merge branch 'master' of github.com:4ian/GD

4ian · Sep 10, 2015 · c02a471 · c02a471
2 parents 958d9bc + 85ba775
commit c02a471
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Extensions/TileMapObject/TileMapObject.cpp b/Extensions/TileMapObject/TileMapObject.cpp
@@ -10,6 +10,7 @@ This project is released under the MIT License.
 
 #if defined(GD_IDE_ONLY) && !defined(GD_NO_WX_GUI)
 #include <wx/bitmap.h> //Must be placed first, otherwise we get errors relative to "cannot convert 'const TCHAR*'..." in wx/msw/winundef.h
+#include <wx/log.h>
 #include <wx/panel.h>
 #endif
 #include "TileMapObject.h"
@@ -145,6 +146,7 @@ bool TileMapObject::GenerateThumbnail(const gd::Project & project, wxBitmap & th
 void TileMapObject::EditObject( wxWindow* parent, gd::Project & game, gd::MainFrameWrapper & mainFrameWrapper )
 {
 #if !defined(GD_NO_WX_GUI)
+    wxLogNull logNo;
     TileMapObjectEditor dialog(parent, game, *this, mainFrameWrapper);
     dialog.ShowModal();
 #endif