fixed a crash and a leak in GetShortcutTarget() (closes bug 1541321)

[wxWidgets.git] / src / common / bmpbase.cpp

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 8d832f5ed9a1c812eb4513a8b347237dd948d065..c0a5d145514c80a3b5a1eefb64985ebb8ce5bb72 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/bitmap.cpp
+// Name:        src/common/bmpbase.cpp
 // Purpose:     wxBitmapBase
 // Author:      VaclavSlavik
 // Created:     2001/04/11
@@ -21,12 +21,16 @@
     defined(__WXMOTIF__) || \
     defined(__WXX11__)
 
-#include "wx/utils.h"
-#include "wx/palette.h"
 #include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif // WX_PRECOMP
+
 #include "wx/module.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)