Store USER icons and cursors as resources instead of xpm bitmaps.
diff --git a/include/bitmaps/ocr_appstarting b/include/bitmaps/ocr_appstarting
deleted file mode 100644
index 2e4793c..0000000
--- a/include/bitmaps/ocr_appstarting
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char *ocr_appstarting[] = {
-" 32 32 3 1 0 0",
-" s None c None",
-". s black c black",
-"X s white c white",
-". ",
-".. .......... ",
-".X. ..XXXXXX.. ",
-".XX. .......... ",
-".XXX. .XXXXXX. ",
-".XXXX. .XXXXXX. ",
-".XXXXX. .XXX.XX. ",
-".XXXXXX. ..X.XX.. ",
-".XXXXXXX. ..XX.. ",
-".XXXXXXXX. ..X. ",
-".XXXXX..... ..XX.. ",
-".XX.XX. ..XXXX.. ",
-".X. .XX. .XX.XXX. ",
-".. .XX. .X.X.XX. ",
-". .XX. ..X.X.X. ",
-" .XX. .......... ",
-" .XX. ..XXXXXX.. ",
-" .XX. .......... ",
-" .. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
-
diff --git a/include/bitmaps/ocr_bummer b/include/bitmaps/ocr_bummer
deleted file mode 100644
index fa31df1..0000000
--- a/include/bitmaps/ocr_bummer
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_bummer[] = {
-"32 32 3 1 5 9",
-" s black c black",
-"X s white c white",
-". s None c None",
-"............ .............",
-"........... XXXXXXX ............",
-"......... XXXXXXXXX ...........",
-"........ XXXXXXXXXXXXX .........",
-"....... XX XXXXXXX XX ........",
-"....... X .. XXXXX .. X ........",
-"....... X ... XXX ... X ........",
-"....... X ... XXX ... X ........",
-"...... XX ... XXX ... XX .......",
-"...... XXX XXXXX XXX .......",
-"...... XXXXXXXX XXXXXXXX .......",
-"...... XXXXXXX . XXXXXXX .......",
-". .... XXXXXX . XXXXXX ... ...",
-" XX .... XXXX . XXXX ... XX ..",
-". XX .... XX XX .... X ...",
-" XXXXX .. XXXXXXX .. XXXX ..",
-" XX XXX XXXXXXX XXX XX ..",
-". ... XXX X XXX .. ...",
-"......... XXX ..........",
-".......... XXXX ..........",
-"...... XXXX XXX .......",
-". XXX ...... XXX ...",
-" XXXXX ............. XXXX ..",
-" XX ................... XX ..",
-". X ...................... X ...",
-". X ...................... X ...",
-".. ........................ ....",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................"};
diff --git a/include/bitmaps/ocr_cross b/include/bitmaps/ocr_cross
deleted file mode 100644
index 5e63cc4..0000000
--- a/include/bitmaps/ocr_cross
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_cross[] = {
-"32 32 3 1 9 9",
-" s None c None",
-". s black c black",
-"X s white c white",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-"XXXXXXXXX.XXXXXXXXX ",
-"................... ",
-"XXXXXXXXX.XXXXXXXXX ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" X.X ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_dragobject b/include/bitmaps/ocr_dragobject
deleted file mode 100644
index def5290..0000000
--- a/include/bitmaps/ocr_dragobject
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_dragobject[] = {
-"32 32 3 1 5 9",
-" s black c black",
-". s None c None",
-"X s white c white",
-" .......................",
-" XXXXXXX .....................",
-" XXXXXXX X ....................",
-" XXXXXXX ....................",
-" XXXXXXXXXX ....................",
-" XXXXXXXXXX ....................",
-" XXXXXXXXXX ....................",
-" XXXXXXXXXX ....................",
-" XXXXXXXXXX ....................",
-" XXXX XXXXX ....................",
-" XXXX XXXX ....................",
-" XXXX X XXX ....................",
-" XXXX XX XX ....................",
-" XXXX XXX X ....................",
-" XXXX .....................",
-"..... XXXXX ....................",
-"..... XXXXXX ...................",
-"..... XXXXXXX ..................",
-"..... XXXXXXXX .................",
-"..... XXXXX ................",
-"..... XX X ....................",
-"..... X . XX ...................",
-"..... ... X ...................",
-"..... .... XX ..................",
-"........... X ..................",
-"........... XX .................",
-"............ X .................",
-"............. ..................",
-"................................",
-"................................",
-"................................",
-"................................"};
diff --git a/include/bitmaps/ocr_hand b/include/bitmaps/ocr_hand
deleted file mode 100644
index e4156b0..0000000
--- a/include/bitmaps/ocr_hand
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_hand[] = {
-"32 32 3 1 7 5",
-" s black c black",
-". s None c None",
-"X s white c white",
-"...... .......................",
-"..... XXX ......................",
-"..... XXX ......................",
-"..... XXX ......................",
-"..... XXX ......................",
-"..... XXX ....................",
-"..... XXX XX .................",
-"..... XXX XX XX ...............",
-"..... XXX XX XX X ..............",
-". . XXX XX XX XX .............",
-". XX XXXXXXXXXXXX .............",
-". XXX XXXXXXXXXXXX .............",
-".. XX XXXXXXXXXXXX .............",
-"... X XXXXXXXXXXXX .............",
-"... XXXXXXXXXXXXXX .............",
-".... XXXXXXXXXXXXX .............",
-".... XXXXXXXXXXXX ..............",
-"..... XXXXXXXXXXX ..............",
-"..... XXXXXXXXXXX ..............",
-"...... XXXXXXXXX ...............",
-"...... XXXXXXXXX ...............",
-"...... ...............",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................"};
diff --git a/include/bitmaps/ocr_help b/include/bitmaps/ocr_help
deleted file mode 100644
index 2fbbabd..0000000
--- a/include/bitmaps/ocr_help
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char *ocr_help[] = {
-" 32 32 3 1 0 0",
-" s None c None",
-". s black c black",
-"X s white c white",
-". ",
-".. XXXXXXX ",
-".X. X.......X ",
-".XX. X...XX....X ",
-".XXX. X...X X....X ",
-".XXXX. X...X X....X ",
-".XXXXX. X...X X....X ",
-".XXXXXX. X...X X...X ",
-".XXXXXXX.XXXXX X...X ",
-".XXXXXXXX. X...X ",
-".XXXXX..... X...X ",
-".XX.XX. X...X ",
-".X. .XX. X...X ",
-".. .XX. XXX ",
-". .XX. X...X ",
-" .XX. X.....X ",
-" .XX. X...X ",
-" .XX. XXX ",
-" .. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
-
diff --git a/include/bitmaps/ocr_ibeam b/include/bitmaps/ocr_ibeam
deleted file mode 100644
index eee4a4a..0000000
--- a/include/bitmaps/ocr_ibeam
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_ibeam[] = {
-"32 32 3 1 4 9",
-" s None c None",
-". s white c white",
-"+ s black c black",
-".... .... ",
-".+++.+++. ",
-"....+.... ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-" .+. ",
-"....+.... ",
-".+++.+++. ",
-".... .... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_icon b/include/bitmaps/ocr_icon
deleted file mode 100644
index 351f744..0000000
--- a/include/bitmaps/ocr_icon
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_icon[] = {
-"32 32 3 1 8 6",
-" s black c black",
-". s None c None",
-"X s white c white",
-" ...............",
-" ...............",
-" XXXXXXXXXXX ...............",
-" XX XX ...............",
-" XX XX ...............",
-" XX XX ...............",
-" XX XX ...............",
-" XX XX ...............",
-" XX XX ...............",
-" XX XX ...............",
-" XXXXXXXXXXX ...............",
-" ...............",
-" ...............",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................"};
diff --git a/include/bitmaps/ocr_no b/include/bitmaps/ocr_no
deleted file mode 100644
index 1fe072f..0000000
--- a/include/bitmaps/ocr_no
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char *ocr_no[] = {
-"32 32 3 1 16 16",
-" s None c None",
-". s white c white",
-"X s black c black",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ...... ",
-" ..XXXXXX.. ",
-" .XXXXXXXXXX. ",
-" .XXXX....XXXX. ",
-" .XXX.. ..XXX. ",
-" .XXXXX. .XXX. ",
-" .XX.XXX. .XX. ",
-" .XXX..XXX. .XXX. ",
-" .XX. .XXX. .XX. ",
-" .XX. .XXX. .XX. ",
-" .XX. .XXX. .XX. ",
-" .XX. .XXX. .XX. ",
-" .XXX. .XXX..XXX. ",
-" .XX. .XXX.XX. ",
-" .XXX. .XXXXX. ",
-" .XXX.. ..XXX. ",
-" .XXXX....XXXX. ",
-" .XXXXXXXXXX. ",
-" ..XXXXXX.. ",
-" ...... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_normal b/include/bitmaps/ocr_normal
deleted file mode 100644
index 47e7409..0000000
--- a/include/bitmaps/ocr_normal
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_normal[] = {
-"32 32 3 1 0 0",
-" s black c black",
-". s None c None",
-"X s white c white",
-" ..............................",
-" X .............................",
-" XX ............................",
-" XXX ...........................",
-" XXXX ..........................",
-" XXXXX .........................",
-" XXXXXX ........................",
-" XXXXXXX .......................",
-" XXXXXXXX ......................",
-" XXXXXXXXX .....................",
-" XXXXXX ....................",
-" XXX XX ........................",
-" XX XX ........................",
-" X . XX .......................",
-" ... XX .......................",
-" ..... XX ......................",
-"...... XX ......................",
-"....... XX .....................",
-"....... XX .....................",
-"........ ......................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................"};
diff --git a/include/bitmaps/ocr_size b/include/bitmaps/ocr_size
deleted file mode 100644
index f33f604..0000000
--- a/include/bitmaps/ocr_size
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_size[] = {
-"32 32 3 1 11 11",
-" s None c None",
-". s black c black",
-"X s white c white",
-" .. ",
-" .XX. ",
-" .XXXX. ",
-" .XXXXXX. ",
-" .XXXXXXXX. ",
-" ....XX.... ",
-" .XX. ",
-" .. .XX. .. ",
-" .X. .XX. .X. ",
-" .XX. .XX. .XX. ",
-" .XXX......XX......XXX. ",
-".XXXXXXXXXXXXXXXXXXXXXX. ",
-".XXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXX......XX......XXX. ",
-" .XX. .XX. .XX. ",
-" .X. .XX. .X. ",
-" .. .XX. .. ",
-" .XX. ",
-" ....XX.... ",
-" .XXXXXXXX. ",
-" .XXXXXX. ",
-" .XXXX. ",
-" .XX. ",
-" .. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_sizenesw b/include/bitmaps/ocr_sizenesw
deleted file mode 100644
index 4159a7f..0000000
--- a/include/bitmaps/ocr_sizenesw
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_sizenesw[] = {
-"32 32 3 1 6 6",
-" s None c None",
-". s black c black",
-"X s white c white",
-" ....... ",
-" .XXXXXX. ",
-" .XXXXX. ",
-" .XXXX. ",
-" .XXXXX. ",
-".. .XXX.XX. ",
-".X. .XXX. .X. ",
-".XX.XXX. .. ",
-".XXXXX. ",
-".XXXX. ",
-".XXXXX. ",
-".XXXXXX. ",
-" ....... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_sizens b/include/bitmaps/ocr_sizens
deleted file mode 100644
index 39fc680..0000000
--- a/include/bitmaps/ocr_sizens
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_sizens[] = {
-"32 32 3 1 4 7",
-" s None c None",
-". s black c black",
-"X s white c white",
-" .. ",
-" .XX. ",
-" .XXXX. ",
-" .XXXXXX. ",
-".XXXXXXXX. ",
-"....XX.... ",
-" .XX. ",
-" .XX. ",
-" .XX. ",
-" .XX. ",
-"....XX.... ",
-".XXXXXXXX. ",
-" .XXXXXX. ",
-" .XXXX. ",
-" .XX. ",
-" .. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_sizenwse b/include/bitmaps/ocr_sizenwse
deleted file mode 100644
index 6f6491f..0000000
--- a/include/bitmaps/ocr_sizenwse
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_sizenwse[] = {
-"32 32 3 1 6 6",
-" s None c None",
-". s black c black",
-"X s white c white",
-" ....... ",
-".XXXXXX. ",
-".XXXXX. ",
-".XXXX. ",
-".XXXXX. ",
-".XX.XXX. .. ",
-".X. .XXX. .X. ",
-".. .XXX.XX. ",
-" .XXXXX. ",
-" .XXXX. ",
-" .XXXXX. ",
-" .XXXXXX. ",
-" ....... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_sizewe b/include/bitmaps/ocr_sizewe
deleted file mode 100644
index 281a9a0..0000000
--- a/include/bitmaps/ocr_sizewe
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_sizewe[] = {
-"32 32 3 1 7 4",
-" s None c None",
-". s black c black",
-"X s white c white",
-" .. .. ",
-" .X. .X. ",
-" .XX. .XX. ",
-" .XXX......XXX. ",
-".XXXXXXXXXXXXXX. ",
-".XXXXXXXXXXXXXX. ",
-" .XXX......XXX. ",
-" .XX. .XX. ",
-" .X. .X. ",
-" .. .. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_up b/include/bitmaps/ocr_up
deleted file mode 100644
index ee5726f..0000000
--- a/include/bitmaps/ocr_up
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_up[] = {
-"32 32 3 1 6 0",
-" s None c None",
-". s black c black",
-"X s white c white",
-" .. ",
-" .. ",
-" .... ",
-" .... ",
-" ..XX.. ",
-" ..XX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXXXX.. ",
-" ..XXXXXX.. ",
-" ..XXXXXXXX.. ",
-" ..XXXXXXXX.. ",
-"..XXXXXXXXXX.. ",
-"..XXXXXXXXXX.. ",
-".....XXXX..... ",
-".....XXXX..... ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ..XXXX.. ",
-" ........ ",
-" ........ ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/ocr_wait b/include/bitmaps/ocr_wait
deleted file mode 100644
index 4c9d73d..0000000
--- a/include/bitmaps/ocr_wait
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * ocr_wait[] = {
-"32 32 3 1 7 13",
-" s black c black",
-". s None c None",
-"X s white c white",
-" .................",
-" .................",
-" XXXXXXXXXXX .................",
-". ..................",
-". XXXXXXXXX ..................",
-". XXXXXXXXX ..................",
-". XXXXXX XX ..................",
-". X X X X X ..................",
-". XX X X XX ..................",
-".. XX X XX ...................",
-"... XX XX ....................",
-".... XXX .....................",
-"..... X ......................",
-"..... X ......................",
-"..... X ......................",
-".... XXX .....................",
-"... XXXXX ....................",
-".. XXX XXX ...................",
-". XXXXXXXXX ..................",
-". XXXX XXXX ..................",
-". XXX X XXX ..................",
-". XX X X XX ..................",
-". X X X X X ..................",
-". ..................",
-" XXXXXXXXXXX .................",
-" .................",
-" .................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................"};
diff --git a/include/bitmaps/oic_bang b/include/bitmaps/oic_bang
deleted file mode 100644
index 1167309..0000000
--- a/include/bitmaps/oic_bang
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * oic_bang[] = {
-"32 32 3 1",
-" s None c None",
-". s black c black",
-"X s yellow c yellow",
-" ........ ",
-" ...XXXXXXXX... ",
-" ..XXXXXXXXXXXXXX.. ",
-" .XXXXX........XXXXX. ",
-" .XXXXXX........XXXXXX. ",
-" .XXXXXXX........XXXXXXX. ",
-" .XXXXXXXX........XXXXXXXX. ",
-" .XXXXXXXXX........XXXXXXXXX. ",
-" .XXXXXXXXX........XXXXXXXXX. ",
-" .XXXXXXXXXX........XXXXXXXXXX. ",
-" .XXXXXXXXXX........XXXXXXXXXX. ",
-" .XXXXXXXXXX........XXXXXXXXXX. ",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-".XXXXXXXXXXX........XXXXXXXXXXX.",
-" .XXXXXXXXXX........XXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXX..XXXXXXXXXXXXX. ",
-" .XXXXXXXXXX......XXXXXXXXXX. ",
-" .XXXXXXXXXX......XXXXXXXXXX. ",
-" .XXXXXXXX........XXXXXXXX. ",
-" .XXXXXXX........XXXXXXX. ",
-" .XXXXXXX......XXXXXXX. ",
-" .XXXXXX......XXXXXX. ",
-" ..XXXXXX..XXXXXX.. ",
-" ...XXXXXXXX... ",
-" ........ "};
diff --git a/include/bitmaps/oic_bang_95 b/include/bitmaps/oic_bang_95
deleted file mode 100644
index 2233cf3..0000000
--- a/include/bitmaps/oic_bang_95
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * oic_bang_95[] = {
-"32 32 6 1",
-" s None c None",
-". s black c black",
-"X s yellow c yellow",
-"x s dkgreen c #008000",
-"o s ltgray c #c0c0c0",
-"O s dkgray c #808080",
-" xxx ",
-" xXXo. ",
-" xXXXXo.O ",
-" xXXXXX.OO ",
-" xXXXXXXo.OO ",
-" xXXXXXXX.OO ",
-" xXXXXXXXXo.OO ",
-" xXXXXXXXXX.OO ",
-" xXXXXXXXXXXo.OO ",
-" xXXXo...oXXX.OO ",
-" xXXXX.....XXXo.OO ",
-" xXXXX.....XXXX.OO ",
-" xXXXXX.....XXXXo.OO ",
-" xXXXXX.....XXXXX.OO ",
-" xXXXXXX.....XXXXXo.OO ",
-" xXXXXXXx...xXXXXXX.OO ",
-" xXXXXXXXo...oXXXXXXo.OO ",
-" xXXXXXXXX...XXXXXXXX.OO ",
-" xXXXXXXXXXx.xXXXXXXXXo.OO ",
-" xXXXXXXXXXo.oXXXXXXXXX.OO ",
-" xXXXXXXXXXXX.XXXXXXXXXXo.OO ",
-" xXXXXXXXXXXXXXXXXXXXXXXX.OO ",
-" xXXXXXXXXXXXo..oXXXXXXXXXo.OO ",
-" xXXXXXXXXXXX....XXXXXXXXXX.OO ",
-"xXXXXXXXXXXXX....XXXXXXXXXXo.OO ",
-"xXXXXXXXXXXXXo..oXXXXXXXXXXX.OO ",
-"xXXXXXXXXXXXXXXXXXXXXXXXXXXX.OOO",
-"xXXXXXXXXXXXXXXXXXXXXXXXXXXo.OOO",
-" xXXXXXXXXXXXXXXXXXXXXXXXXo.OOOO",
-" x........................OOOOO",
-" OOOOOOOOOOOOOOOOOOOOOOOOOOO ",
-" OOOOOOOOOOOOOOOOOOOOOOOOO "};
diff --git a/include/bitmaps/oic_cdrom b/include/bitmaps/oic_cdrom
deleted file mode 100644
index 5c1592f..0000000
--- a/include/bitmaps/oic_cdrom
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * oic_cdrom[] = {
-"20 15 8 1",
-" s None c None",
-". s dkgray c #808080",
-"X s ltgray c #c0c0c0",
-"o s yellow c #ffff00",
-"O s black c #000000",
-"+ s green c #00ff00",
-"@ s cyan c #00ffff",
-"# s white c #ffffff",
-" ...... ",
-" ..XXXXXoOO ",
-" .XXXXXXXo+@O ",
-" .XXXXXXXX+@@oO ",
-" .XXXXXXXX+@ooO ",
-" .XXXXXXXXX@ooooO ",
-" .XXXXX.OO.XXXXXO ",
-" .XXXXXOOOO#XXXXO ",
-" .XXXXX.OO.#XXXXO ",
-" .ooooo@###XXXXXO ",
-" ..oo+@@XXXXXXXO ",
-" .o++@oXXXXXXXO ",
-" .+@@oXXXXXXO ",
-" ..ooXXXXOO ",
-" OOOOOO "};
diff --git a/include/bitmaps/oic_floppy b/include/bitmaps/oic_floppy
deleted file mode 100644
index 3baf623..0000000
--- a/include/bitmaps/oic_floppy
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * oic_floppy[] = {
-"20 15 6 1",
-" s None c None",
-". s black c #000000",
-"x s white c #ffffff",
-"X s ltgray c #c0c0c0",
-"o s dkgray c #808080",
-"O s green c #00ff00",
-" ",
-" ",
-" .................. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .XXXX.......XXXXo. ",
-" .X.............Xo. ",
-" .XXXX.......XXXXo. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .XXXOOXXXXX..XXXo. ",
-" .XXXOOXXXXX..XXXo. ",
-" .oooooooooooooooo. ",
-" .................. ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/oic_folder b/include/bitmaps/oic_folder
deleted file mode 100644
index e50b91b..0000000
--- a/include/bitmaps/oic_folder
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * oic_folder[] = {
-"20 16 6 1",
-" s None c None",
-". s dkgray c #808080",
-"X s yellow c yellow",
-"o s ltgray c #c0c0c0",
-"O s white c white",
-"B s black c black",
-" ",
-" ..... ",
-" .XoXoX. ",
-" .XoXoXoX...... ",
-" .OOOOOOOOOOOO.. ",
-" .OXoXoXoXoXoX.. ",
-" .OoXoXoXoXoXo.. ",
-" .OXoXoXoXoXoX.. ",
-" .OoXoXoXoXoXo.. ",
-" .OXoXoXoXoXoX.. ",
-" .OoXoXoXoXoXo.. ",
-" .OXoXoXoXoXoX.. ",
-" ............... ",
-" .............. ",
-" ",
-" "};
diff --git a/include/bitmaps/oic_folder2 b/include/bitmaps/oic_folder2
deleted file mode 100644
index 5ae8091..0000000
--- a/include/bitmaps/oic_folder2
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * oic_folder2[] = {
-"20 16 6 1",
-" s None c None",
-". s dkgray c #808080",
-"X s yellow c yellow",
-"o s ltgray c #c0c0c0",
-"O s white c white",
-"B s black c black",
-" ",
-" ",
-" ..... ",
-" .OOOOO. ",
-" .O.X.X.O...... ",
-" .OX.X.X.OOOOO.. ",
-" .O.X.X.X.X.X... ",
-" .............X.. ",
-" .OOOOOOOOOO..... ",
-" .OoXoXoXoXoX.... ",
-" .OoXoXoXoXo.... ",
-" .OXoXoXoXoXo... ",
-" .OXoXoXoXoX... ",
-" .............. ",
-" ............. ",
-" "};
diff --git a/include/bitmaps/oic_hand b/include/bitmaps/oic_hand
deleted file mode 100644
index 49f12be..0000000
--- a/include/bitmaps/oic_hand
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * oic_hand[] = {
-"32 32 3 1",
-" s None c None",
-". s red c red",
-"X s white c white",
-" ",
-" .............. ",
-" ................ ",
-" .................. ",
-" .................... ",
-" ...................... ",
-" ........................ ",
-" .......................... ",
-" ............................ ",
-" .............................. ",
-" ......XX..XXXXX..XX...XXX..... ",
-" .....X..X...X...X..X..X..X.... ",
-" .....X..X...X...X..X..X..X.... ",
-" .....X......X...X..X..X..X.... ",
-" .....X......X...X..X..X..X.... ",
-" ......XX....X...X..X..XXX..... ",
-" ........X...X...X..X..X....... ",
-" ........X...X...X..X..X....... ",
-" .....X..X...X...X..X..X....... ",
-" .....X..X...X...X..X..X....... ",
-" .....X..X...X...X..X..X....... ",
-" ......XX....X....XX...X....... ",
-" .............................. ",
-" ............................ ",
-" .......................... ",
-" ........................ ",
-" ...................... ",
-" .................... ",
-" .................. ",
-" ................ ",
-" .............. ",
-" "};
diff --git a/include/bitmaps/oic_hand_95 b/include/bitmaps/oic_hand_95
deleted file mode 100644
index 9265a66..0000000
--- a/include/bitmaps/oic_hand_95
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * oic_hand_95[] = {
-"32 32 5 1",
-" s None c None",
-"o s white c white",
-"O s dkgray c #808080",
-"+ s dkred c #800000",
-"X s red c red",
-" ++++++++ ",
-" +++XXXXXXXX+++ ",
-" +XXXXXXXXXXXXXX+ ",
-" ++XXXXXXXXXXXXXXXX++ ",
-" +XXXXXXXXXXXXXXXXXXXX+ ",
-" +XXXXXXXXXXXXXXXXXXXXXX+ ",
-" +XXXXXXXXXXXXXXXXXXXXXX+O ",
-" +XXXXXXoXXXXXXXXXXoXXXXXX+O ",
-" +XXXXXXoooXXXXXXXXoooXXXXXX+ ",
-" +XXXXXoooooXXXXXXoooooXXXXX+O ",
-" +XXXXXXoooooXXXXoooooXXXXXX+OO ",
-"+XXXXXXXXoooooXXoooooXXXXXXXX+O ",
-"+XXXXXXXXXooooooooooXXXXXXXXX+O ",
-"+XXXXXXXXXXooooooooXXXXXXXXXX+OO",
-"+XXXXXXXXXXXooooooXXXXXXXXXXX+OO",
-"+XXXXXXXXXXXooooooXXXXXXXXXXX+OO",
-"+XXXXXXXXXXooooooooXXXXXXXXXX+OO",
-"+XXXXXXXXXooooooooooXXXXXXXXX+OO",
-"+XXXXXXXXoooooXXoooooXXXXXXXX+OO",
-" +XXXXXXoooooXXXXoooooXXXXXX+OOO",
-" +XXXXXoooooXXXXXXoooooXXXXX+OOO",
-" +XXXXXXoooXXXXXXXXoooXXXXXX+OO ",
-" +XXXXXXoXXXXXXXXXXoXXXXXX+OOO ",
-" +XXXXXXXXXXXXXXXXXXXXXX+OOOO ",
-" +XXXXXXXXXXXXXXXXXXXXXX+OOO ",
-" +XXXXXXXXXXXXXXXXXXXX+OOO ",
-" ++XXXXXXXXXXXXXXXX++OOOO ",
-" O+XXXXXXXXXXXXXX+OOOOO ",
-" O+++XXXXXXXX+++OOOOO ",
-" OO++++++++OOOOOO ",
-" OOOOOOOOOOOOOO ",
-" OOOOOOOO "};
diff --git a/include/bitmaps/oic_hdisk b/include/bitmaps/oic_hdisk
deleted file mode 100644
index 19c0d62..0000000
--- a/include/bitmaps/oic_hdisk
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * oic_hdisk[] = {
-"20 15 5 1",
-" s None c None",
-". s black c black",
-"X s ltgray c #c0c0c0",
-"o s dkgray c #808080",
-"O s green c green",
-" ",
-" ",
-" .................. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .XXXXXXXXXXXXXXXo. ",
-" .oooooooooooooooo. ",
-" .XXXXXXXXXXXOOXXo. ",
-" .XXXXXXXXXXXOOXXo. ",
-" .oooooooooooooooo. ",
-" .................. ",
-" ",
-" "};
diff --git a/include/bitmaps/oic_landscape b/include/bitmaps/oic_landscape
deleted file mode 100644
index d5e2b0b..0000000
--- a/include/bitmaps/oic_landscape
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * oic_landscape[] = {
-"32 32 6 1",
-" s None c None",
-". s black c black",
-"X s ltgray c #c0c0c0",
-"o s white c white",
-"O s dkgray c #808080",
-"+ s blue c blue",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXX.. ",
-" .X.....XXXXXXXXXXXXXX.o. ",
-" .XX.XXX.XXXXXXXXXXXXX.oo. ",
-" .XX.XXX.XXXXXXXXXXXXX.ooo. ",
-" .XX....XXXXXXXXXXXXXX.oooo. ",
-" .XX.XXX.XXXXXXXXXXXXX....... ",
-" .XX.XXX.XXXXXXXXXXXXXXXXXXX.O ",
-" .X.....XXXXXXXXXXXXXXXXXXXX.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .XXX++X+X++X+++X++X+++X+X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+X+X++X++X++X+X++X++X+X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+++X+++X+X++X++X+X++X+++X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X++X+X+++X++++X++X++X++++X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXX.O ",
-" ............................O ",
-" OOOOOOOOOOOOOOOOOOOOOOOOOOOO ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/oic_network b/include/bitmaps/oic_network
deleted file mode 100644
index d27dde1..0000000
--- a/include/bitmaps/oic_network
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * oic_network[] = {
-"20 15 7 1",
-" s None c None",
-". s dkgray c #808080",
-"x s white c #ffffff",
-"X s ltgray c #c0c0c0",
-"o s black c #000000",
-"O s green c #00ff00",
-"+ s yellow c #ffff00",
-" ",
-" ............. ",
-" .XXXXXXXXXXXX.o ",
-" .xxxxxxxxxxxx..o ",
-" .XXXXXXXXXXOX..o ",
-" .XXXXXXXXXXXX..o ",
-" .X..........X..o ",
-" .XxxxxxxxxxxX.o ",
-" ooooooooooooo ",
-" oo ",
-" Xo ",
-" XXXXXX+++oXXXXXX ",
-" oooooo+x+ooooooo ",
-" oooo ",
-" "};
diff --git a/include/bitmaps/oic_note b/include/bitmaps/oic_note
deleted file mode 100644
index 8f92367..0000000
--- a/include/bitmaps/oic_note
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * oic_note[] = {
-"32 32 4 1",
-" s None c None",
-". s black c black",
-"X s blue c blue",
-"o s white c white",
-" ........ ",
-" ...XXXXXXXX... ",
-" ..XXXXXooooXXXXX.. ",
-" .XXXXXXooooooXXXXXX. ",
-" .XXXXXXooooooooXXXXXX. ",
-" .XXXXXXXooooooooXXXXXXX. ",
-" .XXXXXXXXooooooooXXXXXXXX. ",
-" .XXXXXXXXXXooooooXXXXXXXXXX. ",
-" .XXXXXXXXXXXooooXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXoooooooooXXXXXXXXXX. ",
-".XXXXXXXXXXoooooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-" .XXXXXXXXXXXXooooooXXXXXXXXXX. ",
-" .XXXXXXXXXXXXooooooXXXXXXXXXX. ",
-" .XXXXXXXXXXXXooooooXXXXXXXXXX. ",
-" .XXXXXXXXXXXooooooXXXXXXXXX. ",
-" .XXXXXXXXXXXooooooXXXXXXXXX. ",
-" .XXXXXXXooooooooooooXXXXX. ",
-" .XXXXXXooooooooooooXXXX. ",
-" .XXXXXooooooooooooXXX. ",
-" .XXXXXXXXXXXXXXXXXX. ",
-" ..XXXXXXXXXXXXXX.. ",
-" ...XXXXXXXX... ",
-" ........ "};
diff --git a/include/bitmaps/oic_note_95 b/include/bitmaps/oic_note_95
deleted file mode 100644
index 4b80207..0000000
--- a/include/bitmaps/oic_note_95
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * oic_note_95[] = {
-"32 32 6 1",
-" s None c None",
-". s black c black",
-"X s white c white",
-"o s ltgray c #c0c0c0",
-"O s dkgray c #808080",
-"x s blue c blue",
-" OOOOOOOO ",
-" OOOoXXXXXXoOOO ",
-" OOoXXXXXXXXXXXXoOO ",
-" OoXXXXXXXXXXXXXXXXoO ",
-" OXXXXXXXXXXXXXXXXXXXX. ",
-" OXXXXXXXXoxxxxoXXXXXXXX. ",
-" OXXXXXXXXXxxxxxxXXXXXXXXX. ",
-" OoXXXXXXXXXxxxxxxXXXXXXXXXo. ",
-" OXXXXXXXXXXoxxxxoXXXXXXXXXX.O ",
-"OoXXXXXXXXXXXXXXXXXXXXXXXXXXo.O ",
-"OXXXXXXXXXXXXXXXXXXXXXXXXXXXX.O ",
-"OXXXXXXXXXXxxxxxxxXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXxxxxxXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXxxxxxXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXxxxxxXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXxxxxxXXXXXXXXXXo.OO",
-" OXXXXXXXXXXXxxxxxXXXXXXXXXX.OOO",
-" OoXXXXXXXXXXxxxxxXXXXXXXXXo.OOO",
-" OXXXXXXXXXXxxxxxXXXXXXXXX.OOO ",
-" .XXXXXXXxxxxxxxxxXXXXXX.OOOO ",
-" .XXXXXXXXXXXXXXXXXXXX.OOOO ",
-" .oXXXXXXXXXXXXXXXXo.OOOO ",
-" ..oXXXXXXXXXXXXo..OOOO ",
-" O...oXXXXXXo...OOOO ",
-" OOO...oXXX.OOOOOO ",
-" OOOO.XXX.OOOOO ",
-" O.XXX.OO ",
-" .XX.OO ",
-" .X.OO ",
-" ..OO ",
-" OOO ",
-" OO "};
diff --git a/include/bitmaps/oic_portrait b/include/bitmaps/oic_portrait
deleted file mode 100644
index e4c3565..0000000
--- a/include/bitmaps/oic_portrait
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * oic_portrait[] = {
-"32 32 6 1",
-" s None c None",
-". s black c black",
-"X s ltgray c #c0c0c0",
-"o s white c white",
-"O s dkgray c #808080",
-"+ s blue c blue",
-" ................... ",
-" .XXXXXXXXXXXXXXXXX.. ",
-" .X.....XXXXXXXXXXX.o. ",
-" .XX.XXX.XXXXXXXXXX.oo. ",
-" .XX.XXX.XXXXXXXXXX.ooo. ",
-" .XX....XXXXXXXXXXX.oooo. ",
-" .XX.XXX.XXXXXXXXXX....... ",
-" .XX.XXX.XXXXXXXXXXXXXXXX.O ",
-" .X.....XXXXXXXXXXXXXXXXX.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .XXX++X+X++X+X+X+++X+X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+X+X++X++X+X++X++X+X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+++X+++X+X++X+X++X+++X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X++X+X+++X++X+X++X++++X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+X+X++X+X++X++X+X++X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+X+X++X++X+X++X++X+X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+++X+++X+X++X+X++X+++X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X++X+X+++X++X+X++X++++X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+X+X++X+X++X++X+X++X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .X+++X++X+X+X+X+X++X+X+X.O ",
-" .XXXXXXXXXXXXXXXXXXXXXXX.O ",
-" .........................O ",
-" .OOOOOOOOOOOOOOOOOOOOOOOOO "};
diff --git a/include/bitmaps/oic_ques b/include/bitmaps/oic_ques
deleted file mode 100644
index 4b90947..0000000
--- a/include/bitmaps/oic_ques
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * oic_ques[] = {
-"32 32 4 1",
-" s None c None",
-". s black c black",
-"X s green c green",
-"o s white c white",
-" ........ ",
-" ...XXXXXXXX... ",
-" ..XXXXXXXXXXXXXX.. ",
-" .XXXXXXooooooXXXXXX. ",
-" .XXXXXXoooooooooXXXXX. ",
-" .XXXXXXoooooooooooXXXXX. ",
-" .XXXXXXXoooooooooooXXXXXX. ",
-" .XXXXXXXoooooooooooooXXXXXX. ",
-" .XXXXXXXoooooooooooooXXXXXX. ",
-" .XXXXXXXXoooooXXooooooXXXXXXX. ",
-" .XXXXXXXXoooooXXooooooXXXXXXX. ",
-" .XXXXXXXXoooooXXooooooXXXXXXX. ",
-".XXXXXXXXXXXXXXXooooooXXXXXXXXX.",
-".XXXXXXXXXXXXXXXooooooXXXXXXXXX.",
-".XXXXXXXXXXXXXXooooooXXXXXXXXXX.",
-".XXXXXXXXXXXXXXooooooXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXXooooooXXXXXXXXXXX.",
-".XXXXXXXXXXXXooooooXXXXXXXXXXXX.",
-".XXXXXXXXXXXXooooooXXXXXXXXXXXX.",
-" .XXXXXXXXXXXooooooXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXooXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXooooooXXXXXXXXXX. ",
-" .XXXXXXXXXXooooooXXXXXXXXXX. ",
-" .XXXXXXXXooooooooXXXXXXXX. ",
-" .XXXXXXXooooooooXXXXXXX. ",
-" .XXXXXXXooooooXXXXXXX. ",
-" .XXXXXXooooooXXXXXX. ",
-" ..XXXXXXooXXXXXX.. ",
-" ...XXXXXXXX... ",
-" ........ "};
diff --git a/include/bitmaps/oic_ques_95 b/include/bitmaps/oic_ques_95
deleted file mode 100644
index 6aa874d..0000000
--- a/include/bitmaps/oic_ques_95
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * oic_ques_95[] = {
-"32 32 6 1",
-" s None c None",
-". s black c black",
-"X s white c white",
-"o s ltgray c #c0c0c0",
-"O s dkgray c #808080",
-"x s blue c blue",
-" OOOOOOOO ",
-" OOOoXXXXXXoOOO ",
-" OOoXXXXXXXXXXXXoOO ",
-" OoXXXXXXXXXXXXXXXXoO ",
-" OXXXXXXXXXXXXXXXXXXXX. ",
-" OXXXXXXXoxxxxxxoXXXXXXX. ",
-" OXXXXXXXoxoXXxxxxoXXXXXXX. ",
-" OoXXXXXXXxxXXXXxxxxXXXXXXXo. ",
-" OXXXXXXXXxxxxXXxxxxXXXXXXXX.O ",
-"OoXXXXXXXXxxxxXXxxxxXXXXXXXXo.O ",
-"OXXXXXXXXXoxxoXxxxxXXXXXXXXXX.O ",
-"OXXXXXXXXXXXXXoxxxXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXXxxxXXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXXxxoXXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXXxxXXXXXXXXXXXXX.OO",
-"OXXXXXXXXXXXXXXXXXXXXXXXXXXXo.OO",
-" OXXXXXXXXXXXoxxoXXXXXXXXXXX.OOO",
-" OoXXXXXXXXXXxxxxXXXXXXXXXXo.OOO",
-" OXXXXXXXXXXxxxxXXXXXXXXXX.OOO ",
-" .XXXXXXXXXoxxoXXXXXXXXX.OOOO ",
-" .XXXXXXXXXXXXXXXXXXXX.OOOO ",
-" .oXXXXXXXXXXXXXXXXo.OOOO ",
-" ..oXXXXXXXXXXXXo..OOOO ",
-" O...oXXXXXXo...OOOO ",
-" OOO...oXXX.OOOOOO ",
-" OOOO.XXX.OOOOO ",
-" O.XXX.OO ",
-" .XX.OO ",
-" .X.OO ",
-" ..OO ",
-" OOO ",
-" OO "};
diff --git a/include/bitmaps/oic_sample b/include/bitmaps/oic_sample
deleted file mode 100644
index 16a46f8..0000000
--- a/include/bitmaps/oic_sample
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * oic_sample[] = {
-"32 32 6 1",
-" s None c None",
-"+ s white c white",
-"X s black c black",
-"O s blue c blue",
-". s ltgray c #C0C0C0",
-"o s dkgray c #808080",
-" ",
-" ",
-" ",
-" ",
-" ...........................X ",
-" .+++++++++++++++++++++++++oX ",
-" .+........................oX ",
-" .+.OOOOOOOOOOOOOOOOOOOOOO.oX ",
-" .+.OOOOOOOOOOOOOOOOOOOOOO.oX ",
-" .+.OOOOOOOOOOOOOOOOOOOOOO.oX ",
-" .+........................oX ",
-" .+.oooooooooooooooooooooo.oX ",
-" .+.++++++++++++++++++++++.oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .+........................oX ",
-" .ooooooooooooooooooooooooooX ",
-" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ",
-" ",
-" ",
-" ",
-" "};
diff --git a/include/bitmaps/oic_wineicon b/include/bitmaps/oic_wineicon
deleted file mode 100644
index a2d8b5c..0000000
--- a/include/bitmaps/oic_wineicon
+++ /dev/null
@@ -1,43 +0,0 @@
-/* XPM */
-static char * oic_wineicon[] = {
-"32 32 8 1",
-" s None c None",
-". s cyan c cyan",
-"X s purple c #800080",
-"o s black c black",
-"O s white c white",
-"+ s dkyellow c #808000",
-"@ s yellow c yellow",
-"# s red c red",
-" . . . . . XX ",
-" . XX ",
-" . . XXXX ",
-" . . . XXXX ",
-" oo.ooooooo.oooooooXX ",
-" oooooOOOOO.OOOOOO.OOOOXXooooo ",
-" oOOOo.ooooooooooooooXXoOOOo ",
-" oOOO++@@@.@@@@@@.@@XXOOOo ",
-" o+++@@@@@@@@@@@@@XX+++o ",
-" o++++++++++++++XX+++o ",
-" o+++++++++++++XX++o ",
-" o+++++++++++XX++o ",
-" o++++++++++XX+o ",
-" o+++++##+XX+o ",
-" o+++####X+o ",
-" o+++##XXo ",
-" oo+++oo ",
-" ooo ",
-" oOo ",
-" oOo ",
-" oOo ",
-" oOo ",
-" oOo ",
-" oOo ",
-" oOo ",
-" oOo ",
-" oooooOooooo ",
-" oooooOOOoOOOoOOOooooo ",
-" oOOOOOOOoOOOOOoOOOOOOOo ",
-" oOOOOOOOOOOOOOOOOOOOOOo ",
-" oooooOOOOOOOOOOOooooo ",
-" ooooooooooo "};
diff --git a/include/winuser.h b/include/winuser.h
index 75c8fea..8050f54 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -357,9 +357,6 @@
#define OBM_SIZE 32766
#define OBM_OLD_CLOSE 32767
-#define OCR_BUMMER 100
-#define OCR_DRAGOBJECT 101
-
#define OCR_NORMAL 32512
#define OCR_IBEAM 32513
#define OCR_WAIT 32514
@@ -376,7 +373,11 @@
#define OCR_NO 32648
#define OCR_HAND 32649
#define OCR_APPSTARTING 32650
+#ifdef __WINE__
#define OCR_HELP 32651 /* only defined in wine */
+#define OCR_BUMMER 32652
+#define OCR_DRAGOBJECT 32653
+#endif
#define OIC_SAMPLE 32512
#define OIC_HAND 32513
