Remove *.ico files and used only xpm or new pgn bitmaps for icons under Window.

Fix minor other issues.
Remove unused files.

bitmap2component/bitmap2cmp_gui.cpp

@@ -36,7 +36,9 @@
 #include "potracelib.h"
 #include "bitmap_io.h"
 
-#include "bitmap2component.xpm"
+#ifndef USE_PNG_BITMAPS
+#include "icon_bitmap2component.xpm"
+#endif
 
 #include "colors_selection.h"
 #include "build_version.h"
@@ -98,11 +100,10 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL )
     m_Config->Read( KEYWORD_LAST_INPUT_FILE, &m_BitmapFileName );
     m_Config->Read( KEYWORD_LAST_OUTPUT_FILE, &m_ConvertedFileName );
 
-    #ifdef __WINDOWS__
-    SetIcon( wxICON( bitmap2component_icon ) );
-    #else
-    SetIcon( wxICON( bitmap2component ) );
-    #endif
+    // Give an icon
+    wxIcon icon;
+    icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_xpm ) );
+    SetIcon( icon );
 
     GetSizer()->SetSizeHints( this );