more bitmaps work

bitmaps/Browse_Files.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * browse_files_xpm[] = {
+#ifndef XPMMAIN
+extern const char * browse_files_xpm[];
+#else
+const char * browse_files_xpm[] = {
 "16 16 66 1",
 " 	c None",
 ".	c #000000",
@@ -83,3 +86,5 @@ static const char * browse_files_xpm[] = {
 " .xcynztttt..tA.",
 "  ............. ",
 "                "};
+#endif
+

bitmaps/New_Project.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * new_project_xpm[] = {
+#ifndef XPMMAIN
+extern const char * new_project_xpm[];
+#else
+const char * new_project_xpm[] = {
 "16 16 30 1",
 " 	c None",
 ".	c #000000",
@@ -47,3 +50,5 @@ static const char * new_project_xpm[] = {
 ".>#$$$$(<...    ",
 ".|))))))1       ",
 ".........       "};
+#endif
+

bitmaps/Open_Project.xpm

@@ -1,5 +1,8 @@
 /* XPM */ 
-static const char * open_project_xpm[] = {
+#ifndef XPMMAIN
+extern const char * open_project_xpm[];
+#else
+const char * open_project_xpm[] = {
 "16 16 67 1",
 " 	c None",
 "!	c black",
@@ -84,3 +87,5 @@ static const char * open_project_xpm[] = {
 "_PPPPPPPP`!!    ",
 "abccccccde!     ",
 "!!!!!!!!!!!     "};
+#endif
+

bitmaps/Zoom_1.xpm

@@ -2,7 +2,7 @@
 #ifndef XPMMAIN
 extern const char * zoom_1_xpm[];
 #else
-static const char * zoom_1_xpm[] = {
+const char * zoom_1_xpm[] = {
 "16 16 36 1",
 " 	c None",
 ".	c #000000",

bitmaps/ercerr.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char *error_xpm[] = {
+#ifndef XPMMAIN
+extern const char * error_xpm[];
+#else
+const char *error_xpm[] = {
 /* columns rows colors const chars-per-pixel */
 "11 11 2 1",
 "- c Black",
@@ -18,3 +21,5 @@ static const char *error_xpm[] = {
 "X----------X",
 "XXXXXXXXXXXX"
 };
+#endif
+

bitmaps/ercgreen.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char *green_xpm[] = {
+#ifndef XPMMAIN
+extern const char * green_xpm[];
+#else
+const char *green_xpm[] = {
 /* columns rows colors const chars-per-pixel */
 "11 11 2 1",
 "- c Black",
@@ -18,3 +21,5 @@ static const char *green_xpm[] = {
 "XXXXXXXXXXXX",
 "XXXXXXXXXXXX"
 };
+#endif
+

bitmaps/ercwarn.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char *warning_xpm[] = {
+#ifndef XPMMAIN
+extern const char * warning_xpm[];
+#else
+const char *warning_xpm[] = {
 /* columns rows colors const chars-per-pixel */
 "11 11 2 1",
 "- c Black",
@@ -18,3 +21,5 @@ static const char *warning_xpm[] = {
 "XXX-XXX-XXX",
 "XXXXXXXXXXX"
 };
+#endif
+

bitmaps/icon_cvpcb_small.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * icon_cvpcb_small_xpm[] = {
+#ifndef XPMMAIN
+extern const char * icon_cvpcb_small_xpm[];
+#else
+const char * icon_cvpcb_small_xpm[] = {
 "16 16 132 2",
 "  	c None",
 ". 	c #FF7800",
@@ -149,3 +152,5 @@ static const char * icon_cvpcb_small_xpm[] = {
 "                  + @ # $ % & * ",
 "                  .   . . . .   ",
 "                  . . . . . .   "};
+#endif
+

bitmaps/icon_gerbview_small.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * icon_gerbview_small_xpm[] = {
+#ifndef XPMMAIN
+extern const char * icon_gerbview_small_xpm[];
+#else
+const char * icon_gerbview_small_xpm[] = {
 "16 16 166 2",
 "  	c None",
 ". 	c #424040",
@@ -183,3 +186,5 @@ static const char * icon_gerbview_small_xpm[] = {
 "+ q.r.s.;.t.u.v.w.x.y.z.A.B.C.D.",
 ". ~ 1 e o E.G T @.F.G.H.C.C.I.  ",
 "                                "};
+#endif
+

bitmaps/new_cvpcb.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * new_cvpcb_xpm[] = {
+#ifndef XPMMAIN
+extern const char * new_cvpcb_xpm[];
+#else
+const char * new_cvpcb_xpm[] = {
 "16 16 87 1",
 " 	c None",
 ".	c #000000",
@@ -104,3 +107,5 @@ static const char * new_cvpcb_xpm[] = {
 ".+######;>,'.V).",
 ".)))))))&&&&))).",
 " .............. "};
+#endif
+

bitmaps/new_gerb.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * new_gerb_xpm[] = {
+#ifndef XPMMAIN
+extern const char * new_gerb_xpm[];
+#else
+const char * new_gerb_xpm[] = {
 "16 16 78 1",
 " 	c None",
 ".	c #000000",
@@ -95,3 +98,5 @@ static const char * new_gerb_xpm[] = {
 ".+########LMMM~.",
 ".~~~~~~~~~~~~~~.",
 " .............. "};
+#endif
+

bitmaps/new_pcb.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * new_pcb_xpm[] = {
+#ifndef XPMMAIN
+extern const char * new_pcb_xpm[];
+#else
+const char * new_pcb_xpm[] = {
 "16 16 35 1",
 " 	c None",
 ".	c #000000",
@@ -52,3 +55,5 @@ static const char * new_pcb_xpm[] = {
 ".+..........6=>.",
 ".>>===========>.",
 " .............. "};
+#endif
+

bitmaps/new_python.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * new_python_xpm[] = {
+#ifndef XPMMAIN
+extern const char * new_python_xpm[];
+#else
+const char * new_python_xpm[] = {
 "16 16 112 2",
 "  	c None",
 ". 	c #000000",
@@ -129,3 +132,5 @@ static const char * new_python_xpm[] = {
 ". + # # # ).!.~.{.# '.].].].3 . ",
 ". 3 3 3 3 3 3 3 3 3 3 3 3 3 3 . ",
 "  . . . . . . . . . . . . . .   "};
+#endif
+

bitmaps/new_sch.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * new_sch_xpm[] = {
+#ifndef XPMMAIN
+extern const char * new_sch_xpm[];
+#else
+const char * new_sch_xpm[] = {
 "16 16 66 1",
 " 	c None",
 ".	c #000000",
@@ -83,3 +86,5 @@ static const char * new_sch_xpm[] = {
 ".+.w(yzwwwA.vv_.",
 ".______________.",
 " .............. "};
+#endif
+

bitmaps/reload.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * reload_xpm[] = {
+#ifndef XPMMAIN
+extern const char * reload_xpm[];
+#else
+const char * reload_xpm[] = {
 "16 16 152 2",
 "  	c None",
 ". 	c #3ACF73",
@@ -169,3 +172,5 @@ static const char * reload_xpm[] = {
 "    e.r.s.                      ",
 "      t.u.                      ",
 "                                "};
+#endif
+

bitmaps/treesel.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char *tree_sel_xpm[] = {
+#ifndef XPMMAIN
+extern const char * tree_sel_xpm[];
+#else
+const char *tree_sel_xpm[] = {
 /* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 "  c Gray0",
@@ -26,4 +29,5 @@ static const char *tree_sel_xpm[] = {
 "@@@@@@@XXXXXX@@@",
 "@@@@@@@@@@X@@@@@"
 };
+#endif
 

bitmaps/unknown.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * unknown_xpm[] = {
+#ifndef XPMMAIN
+extern const char * unknown_xpm[];
+#else
+const char * unknown_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #C6C6D5",
@@ -66,3 +69,5 @@ static const char * unknown_xpm[] = {
 "  .12_d),e]bg+  ",
 "  .;22{)=e6bg+  ",
 "  ++++++++++++  "};
+#endif
+

bitmaps/unzip.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * unzip_xpm[] = {
+#ifndef XPMMAIN
+extern const char * unzip_xpm[];
+#else
+const char * unzip_xpm[] = {
 "16 16 16 1",
 " 	c none",
 ".	c #060304",
@@ -33,3 +36,5 @@ static const char * unzip_xpm[] = {
 " ...%=;&&%%#..  ",
 "   ..#:%$....   ",
 "     .....      "};
+#endif
+

bitmaps/zip.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char * zip_xpm[] = {
+#ifndef XPMMAIN
+extern const char * zip_xpm[];
+#else
+const char * zip_xpm[] = {
 "16 16 16 1",
 " 	c none",
 ".	c #060304",
@@ -33,3 +36,5 @@ static const char * zip_xpm[] = {
 " ...&=;%%&&X..  ",
 "   ..X:&$....   ",
 "     .....      "};
+#endif
+

bitmaps/zip_tool.xpm

@@ -1,5 +1,8 @@
 /* XPM */
-static const char *zip_tool_xpm[] = {
+#ifndef XPMMAIN
+extern const char * zip_tool_xpm[];
+#else
+const char *zip_tool_xpm[] = {
 /* width height num_colors const chars_per_pixel */
 "16 15 16 1",
 "A c #040604",
@@ -34,4 +37,5 @@ static const char *zip_tool_xpm[] = {
 "FAAAAAAAAAAAAAAF",
 "FFFFFFFFFFFFFFFF"
 };
+#endif
 

bitmaps/zoom.xpm

@@ -1,7 +1,6 @@
 /* XPM */
 #ifndef XPMMAIN
 extern const char * zoom_xpm[];
-
 #else
 const char * zoom_xpm[] = {
 "16 16 3 1",

eeschema/hierarch.cpp

@@ -17,8 +17,7 @@
 #include "wx/treectrl.h"
 
 
-#include "../bitmaps/treesel.xpm"
-#include "../bitmaps/treensel.xpm"
+#include "bitmaps.h"
 
 
 static bool UpdateScreenFromSheet(WinEDA_SchematicFrame * frame);

include/bitmaps.h

@@ -219,6 +219,10 @@
 	#include "../bitmaps/unknown.xpm"
 	#include "../bitmaps/new_pcb.xpm"
 
+	#include "../bitmaps/treesel.xpm"
+	#include "../bitmaps/ercerr.xpm"
+	#include "../bitmaps/ercwarn.xpm"
+
 // Largeur du toolbar vertical
 #define VTOOLBAR_WIDTH 26
 // dimension d'un tool vertical