Avoid sharing gdicmn for just bitmaps

common/bitmap.cpp

@@ -25,6 +25,7 @@
 
 #include <wx/image.h>
 #include <wx/bitmap.h>
+#include <wx/gdicmn.h>
 #include <wx/mstream.h>
 #include <wx/menu.h>
 #include <wx/menuitem.h>
@@ -201,7 +202,7 @@ wxBitmap* KiBitmapNew( BITMAPS aBitmap )
 
 
 bool SaveCanvasImageToFile( EDA_DRAW_FRAME* aFrame, const wxString& aFileName,
-                            wxBitmapType aBitmapType )
+                            BITMAP_TYPE aBitmapType )
 {
     wxCHECK( aFrame != nullptr, false );
 
@@ -220,7 +221,15 @@ bool SaveCanvasImageToFile( EDA_DRAW_FRAME* aFrame, const wxString& aFileName,
 
     wxImage image = bitmap.ConvertToImage();
 
-    if( !image.SaveFile( aFileName, aBitmapType ) )
+    wxBitmapType type = wxBITMAP_TYPE_PNG;
+    switch( aBitmapType )
+    {
+    case BITMAP_TYPE::PNG: type = wxBITMAP_TYPE_PNG; break;
+    case BITMAP_TYPE::BMP: type = wxBITMAP_TYPE_BMP; break;
+    case BITMAP_TYPE::JPG: type = wxBITMAP_TYPE_JPEG; break;
+    }
+
+    if( !image.SaveFile( aFileName, type ) )
         retv = false;
 
     image.Destroy();