Skip to content

W
wine-winehq
Commit 2cc54c8c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved the OEM bitmaps that don't depend on the Wine look into the

user32 resources.
parent f250b6b5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 706 deletions
dlls/user/resources/user32.rc
View file @ 2cc54c8c
......@@ -17,6 +17,7 @@
* neutral language. This will prevent them from
* being duplicated for each language.
*/
#include "resources/user32_bitmaps.rc"
#include "resources/user32_cursors.rc"
#include "resources/user32_icons.rc"
......
graphics/x11drv/oembitmap.c
View file @ 2cc54c8c
......@@ -32,50 +32,21 @@ typedef unsigned long Pixel;
#include "x11drv.h"
/* Include OEM pixmaps */
#include "bitmaps/obm_lfarrowi"
#include "bitmaps/obm_rgarrowi"
#include "bitmaps/obm_dnarrowi"
#include "bitmaps/obm_uparrowi"
#include "bitmaps/obm_combo"
#include "bitmaps/obm_mnarrow"
#include "bitmaps/obm_lfarrowd"
#include "bitmaps/obm_rgarrowd"
#include "bitmaps/obm_dnarrowd"
#include "bitmaps/obm_uparrowd"
#include "bitmaps/obm_restored"
#include "bitmaps/obm_restore"
#include "bitmaps/obm_lfarrow"
#include "bitmaps/obm_rgarrow"
#include "bitmaps/obm_dnarrow"
#include "bitmaps/obm_uparrow"
#include "bitmaps/obm_old_restore"
#include "bitmaps/obm_old_zoom"
#include "bitmaps/obm_old_reduce"
#include "bitmaps/obm_btncorners"
#include "bitmaps/obm_checkboxes"
#include "bitmaps/obm_check"
#include "bitmaps/obm_btsize"
#include "bitmaps/obm_old_lfarrow"
#include "bitmaps/obm_old_rgarrow"
#include "bitmaps/obm_old_dnarrow"
#include "bitmaps/obm_old_uparrow"
#include "bitmaps/obm_size"
#include "bitmaps/obm_old_close"
#include "bitmaps/obm_trtype"
#include "bitmaps/obm_zoomd"
#include "bitmaps/obm_reduced"
#include "bitmaps/obm_zoom"
#include "bitmaps/obm_reduce"
#include "bitmaps/obm_close"
#include "bitmaps/obm_zoomd_95"
#include "bitmaps/obm_reduced_95"
#include "bitmaps/obm_zoom_95"
#include "bitmaps/obm_reduce_95"
#include "bitmaps/obm_close_95"
#include "bitmaps/obm_closed_95"
#include "bitmaps/obm_reduce"
#include "bitmaps/obm_reduce_95"
#include "bitmaps/obm_reduced"
#include "bitmaps/obm_reduced_95"
#include "bitmaps/obm_restore"
#include "bitmaps/obm_restore_95"
#include "bitmaps/obm_restored"
#include "bitmaps/obm_restored_95"
#include "bitmaps/obm_zoom"
#include "bitmaps/obm_zoom_95"
#include "bitmaps/obm_zoomd"
#include "bitmaps/obm_zoomd_95"
DECLARE_DEBUG_CHANNEL(bitmap);
DECLARE_DEBUG_CHANNEL(cursor);
......@@ -91,42 +62,42 @@ static struct
BOOL color; /* Is it a color bitmap? */
} OBM_Pixmaps_Data[OBM_LAST-OBM_FIRST+1] = {
{ obm_closed_95,TRUE}, /* OBM_CLOSED */
{ obm_trtype, TRUE }, /* OBM_TRTYPE */
{ NULL, FALSE }, /* OBM_TRTYPE */
{ NULL, FALSE }, /* unused */
{ obm_lfarrowi, TRUE }, /* OBM_LFARROWI */
{ obm_rgarrowi, TRUE }, /* OBM_RGARROWI */
{ obm_dnarrowi, TRUE }, /* OBM_DNARROWI */
{ obm_uparrowi, TRUE }, /* OBM_UPARROWI */
{ obm_combo, FALSE }, /* OBM_COMBO */
{ obm_mnarrow, FALSE }, /* OBM_MNARROW */
{ obm_lfarrowd, TRUE }, /* OBM_LFARROWD */
{ obm_rgarrowd, TRUE }, /* OBM_RGARROWD */
{ obm_dnarrowd, TRUE }, /* OBM_DNARROWD */
{ obm_uparrowd, TRUE }, /* OBM_UPARROWD */
{ NULL, FALSE }, /* OBM_LFARROWI */
{ NULL, FALSE }, /* OBM_RGARROWI */
{ NULL, FALSE }, /* OBM_DNARROWI */
{ NULL, FALSE }, /* OBM_UPARROWI */
{ NULL, FALSE }, /* OBM_COMBO */
{ NULL, FALSE }, /* OBM_MNARROW */
{ NULL, FALSE }, /* OBM_LFARROWD */
{ NULL, FALSE }, /* OBM_RGARROWD */
{ NULL, FALSE }, /* OBM_DNARROWD */
{ NULL, FALSE }, /* OBM_UPARROWD */
{ obm_restored, TRUE }, /* OBM_RESTORED */
{ obm_zoomd, TRUE }, /* OBM_ZOOMD */
{ obm_reduced, TRUE }, /* OBM_REDUCED */
{ obm_restore, TRUE }, /* OBM_RESTORE */
{ obm_zoom, TRUE }, /* OBM_ZOOM */
{ obm_reduce, TRUE }, /* OBM_REDUCE */
{ obm_lfarrow, TRUE }, /* OBM_LFARROW */
{ obm_rgarrow, TRUE }, /* OBM_RGARROW */
{ obm_dnarrow, TRUE }, /* OBM_DNARROW */
{ obm_uparrow, TRUE }, /* OBM_UPARROW */
{ NULL, FALSE }, /* OBM_LFARROW */
{ NULL, FALSE }, /* OBM_RGARROW */
{ NULL, FALSE }, /* OBM_DNARROW */
{ NULL, FALSE }, /* OBM_UPARROW */
{ obm_close, TRUE }, /* OBM_CLOSE */
{ obm_old_restore, FALSE }, /* OBM_OLD_RESTORE */
{ obm_old_zoom, FALSE }, /* OBM_OLD_ZOOM */
{ obm_old_reduce, FALSE }, /* OBM_OLD_REDUCE */
{ obm_btncorners, FALSE }, /* OBM_BTNCORNERS */
{ obm_checkboxes, FALSE }, /* OBM_CHECKBOXES */
{ obm_check, FALSE }, /* OBM_CHECK */
{ obm_btsize, FALSE }, /* OBM_BTSIZE */
{ obm_old_lfarrow, FALSE }, /* OBM_OLD_LFARROW */
{ obm_old_rgarrow, FALSE }, /* OBM_OLD_RGARROW */
{ obm_old_dnarrow, FALSE }, /* OBM_OLD_DNARROW */
{ obm_old_uparrow, FALSE }, /* OBM_OLD_UPARROW */
{ obm_size, FALSE }, /* OBM_SIZE */
{ obm_old_close, FALSE }, /* OBM_OLD_CLOSE */
{ NULL, FALSE }, /* OBM_OLD_RESTORE */
{ NULL, FALSE }, /* OBM_OLD_ZOOM */
{ NULL, FALSE }, /* OBM_OLD_REDUCE */
{ NULL, FALSE }, /* OBM_BTNCORNERS */
{ NULL, FALSE }, /* OBM_CHECKBOXES */
{ NULL, FALSE }, /* OBM_CHECK */
{ NULL, FALSE }, /* OBM_BTSIZE */
{ NULL, FALSE }, /* OBM_OLD_LFARROW */
{ NULL, FALSE }, /* OBM_OLD_RGARROW */
{ NULL, FALSE }, /* OBM_OLD_DNARROW */
{ NULL, FALSE }, /* OBM_OLD_UPARROW */
{ NULL, FALSE }, /* OBM_SIZE */
{ NULL, FALSE }, /* OBM_OLD_CLOSE */
};
......
include/bitmaps/obm_btncorners deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_btncorners[] = {
"30 10 2 1",
" s white c white",
". s black c black",
" ",
" .... ",
" .... ...... ",
" . . .. .. .... ",
" . . .. .. .... ",
" . . .. .. .... ",
" . . .. .. .... ",
" .... ...... ",
" .... ",
" "};
include/bitmaps/obm_btsize deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_btsize[] = {
"15 15 2 1",
" s black c black",
". s white c white",
" ",
" ....... ..... ",
" ....... ..... ",
" ....... ..... ",
" ....... ..... ",
" ....... ..... ",
" ....... ..... ",
" ....... ..... ",
" ..... ",
" ............. ",
" ............. ",
" ............. ",
" ............. ",
" ............. ",
" "};
include/bitmaps/obm_check deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_check[] = {
"14 14 2 1",
" s white c white",
". s black c black",
" ",
" . ",
" . ",
" .. ",
" . ",
" .. ",
" .. . ",
" .. .. ",
" . . ",
" ... ",
" . ",
" ",
" ",
" "};
include/bitmaps/obm_checkboxes deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_checkboxes[] = {
"56 39 2 1",
" s white c white",
". s black c black",
"............. ............. ............. ............. ",
". . .. .. ............. ............. ",
". . . . . . .. .. ... ... ",
". . . . . . .. .. .. . . .. ",
". . . . . . .. .. .. . . .. ",
". . . . . . .. .. .. . . .. ",
". . . . . .. .. .. . .. ",
". . . . . . .. .. .. . . .. ",
". . . . . . .. .. .. . . .. ",
". . . . . . .. .. .. . . .. ",
". . . . . . .. .. ... ... ",
". . .. .. ............. ............. ",
"............. ............. ............. ............. ",
" ... ... ... ... ",
" .. .. .. .. ....... ....... ",
" . . . . ... ... ... ... ",
" . . . ... . .. .. ... ... ... ",
" . . . ..... . .. .. .. ..... .. ",
". . . ....... . .. .. .. ....... .. ",
". . . ....... . .. .. .. ....... .. ",
". . . ....... . .. .. .. ....... .. ",
" . . . ..... . .. .. .. ..... .. ",
" . . . ... . .. .. ... ... ... ",
" . . . . ... ... ... ... ",
" .. .. .. .. ....... ....... ",
" ... ... ... ... ",
" ............. ............. ",
" . . . . . . . ............. ",
" .. . . . . .. .. . . . . .. ",
" . . . . . . . ... . . . ... ",
" .. . . . . .. .. . . . . .. ",
" . . . . . . . ... . . . ... ",
" .. . . . . .. .. . . . . .. ",
" . . . . . . . ... . . . ... ",
" .. . . . . .. .. . . . . .. ",
" . . . . . . . ... . . . ... ",
" .. . . . . .. .. . . . . .. ",
" . . . . . . . ............. ",
" ............. ............. "};
include/bitmaps/obm_combo deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_combo[] = {
"7 9 2 1",
" s white c white",
". s black c black",
" ... ",
" ... ",
" ... ",
".......",
" ..... ",
" ... ",
" . ",
" ",
"......."};
include/bitmaps/obm_dnarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_dnarrow[] = {
"17 17 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .oooooOOOooooXX ",
" .oooooOOOooooXX ",
" .oooooOOOooooXX ",
" .oooOOOOOOOooXX ",
" .ooooOOOOOoooXX ",
" .oooooOOOooooXX ",
" .ooooooOoooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_dnarrowd deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_dnarrowd[] = {
"17 17 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ",
" ............... ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXoooooooXXX ",
" .XXXXXoooooXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXXXoXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_dnarrowi deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_dnarrowi[] = {
"17 17 4 1",
" s button_text c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .oooooXXXooooXX ",
" .oooooXXX.oooXX ",
" .oooooXXX.oooXX ",
" .oooXXXXXXXooXX ",
" .ooooXXXXX..oXX ",
" .oooooXXX..ooXX ",
" .ooooooX..oooXX ",
" .ooooooo.ooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_lfarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_lfarrow[] = {
"17 17 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooOoooooXX ",
" .oooooOOoooooXX ",
" .ooooOOOOOOooXX ",
" .oooOOOOOOOooXX ",
" .ooooOOOOOOooXX ",
" .oooooOOoooooXX ",
" .ooooooOoooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_lfarrowd deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_lfarrowd[] = {
"17 17 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ",
" ............... ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXoXXXXXX ",
" .XXXXXXooXXXXXX ",
" .XXXXXooooooXXX ",
" .XXXXoooooooXXX ",
" .XXXXXooooooXXX ",
" .XXXXXXooXXXXXX ",
" .XXXXXXXoXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_lfarrowi deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_lfarrowi[] = {
"17 17 4 1",
" s button_text c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooX.ooooXX ",
" .oooooXX.ooooXX ",
" .ooooXXXXXXooXX ",
" .oooXXXXXXX.oXX ",
" .ooooXXXXXX.oXX ",
" .oooooXXo...oXX ",
" .ooooooX.ooooXX ",
" .ooooooo.ooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_mnarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_mnarrow[] = {
"7 11 2 1",
" s white c white",
". s black c black",
" ",
" . ",
" .. ",
" ... ",
" .... ",
" ..... ",
" .... ",
" ... ",
" .. ",
" . ",
" "};
include/bitmaps/obm_old_close deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_close[] = {
"50 19 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .................... .......... ",
" . .. . .. ",
" . .. . .. ",
" ..................... ........... ",
" .................... .......... ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
include/bitmaps/obm_old_dnarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_dnarrow[] = {
"15 15 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" ... ",
" ... ",
" ... ",
" ... ",
" ......... ",
" ....... ",
" ..... ",
" ... ",
" . ",
" ",
" ",
" "};
include/bitmaps/obm_old_lfarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_lfarrow[] = {
"15 15 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" . ",
" .. ",
" ... ",
" ........ ",
" ......... ",
" ........ ",
" ... ",
" .. ",
" . ",
" ",
" ",
" "};
include/bitmaps/obm_old_reduce deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_reduce[] = {
"25 19 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" ..... ",
" . . ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" .... .... ",
" . ... ",
" . ... ",
" . ... ",
" . ... ",
" ... ",
" . ",
" "};
include/bitmaps/obm_old_restore deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_restore[] = {
"25 19 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ..... . ",
" . .. . .. ",
" . .. . .. ",
" . .. . .. ",
" . .. . .. ",
" . ...... ..... ",
" . .. . .... ",
" . .. . .. ",
" .... ...... .. ",
" . .... .. ",
" . ... . .. ",
" . ... . .. ",
" . ... . .. ",
" ... ...... ",
" . ..... ",
" ",
" "};
include/bitmaps/obm_old_rgarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_rgarrow[] = {
"15 15 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" . ",
" .. ",
" ... ",
" ........ ",
" ......... ",
" ........ ",
" ... ",
" .. ",
" . ",
" ",
" ",
" "};
include/bitmaps/obm_old_uparrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_uparrow[] = {
"15 15 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" . ",
" ... ",
" ..... ",
" ....... ",
" ......... ",
" ... ",
" ... ",
" ... ",
" ... ",
" ",
" ",
" "};
include/bitmaps/obm_old_zoom deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_old_zoom[] = {
"25 19 2 1",
" s white c white",
". s black c black",
" ",
" ",
" . ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" .... ..... ",
" . .... ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" . .. ",
" ...... ",
" ..... ",
" ",
" "};
include/bitmaps/obm_rgarrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_rgarrow[] = {
"17 17 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooOoooooXX ",
" .ooooooOOooooXX ",
" .oooOOOOOOoooXX ",
" .oooOOOOOOOooXX ",
" .oooOOOOOOoooXX ",
" .ooooooOOooooXX ",
" .ooooooOoooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_rgarrowd deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_rgarrowd[] = {
"17 17 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ",
" ............... ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXoXXXXXX ",
" .XXXXXXXooXXXXX ",
" .XXXXooooooXXXX ",
" .XXXXoooooooXXX ",
" .XXXXooooooXXXX ",
" .XXXXXXXooXXXXX ",
" .XXXXXXXoXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_rgarrowi deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_rgarrowi[] = {
"17 17 4 1",
" s button_text c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooXoooooXX ",
" .ooooooXXooooXX ",
" .oooXXXXXXoooXX ",
" .oooXXXXXXXooXX ",
" .oooXXXXXX..oXX ",
" .oooo..XX..ooXX ",
" .ooooooX..oooXX ",
" .ooooooo.ooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_size deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_size[] = {
"13 13 2 1",
" s white c white",
". s black c black",
" ",
" ",
" ",
" ",
" ",
" ",
"........ ",
"........ ",
" ... ",
" ... ",
" ... ",
" ... ",
" ... "};
include/bitmaps/obm_trtype deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_trtype[] = {
"14 14 3 1",
" s white c white",
". s black c black",
"o s dkgray c #808080",
" ",
" oooooooo ",
" oo oo oo ",
" o oo o ",
" o o........ ",
" o.. .. .. ",
" o. .. . ",
" o. .. . ",
" oo .. ",
" ooooooo.. ",
" .. ",
" .. ",
" ...... ",
" "};
include/bitmaps/obm_uparrow deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_uparrow[] = {
"17 17 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooOoooooXX ",
" .oooooOOOooooXX ",
" .ooooOOOOOoooXX ",
" .oooOOOOOOOooXX ",
" .oooooOOOooooXX ",
" .oooooOOOooooXX ",
" .oooooOOOooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_uparrowd deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_uparrowd[] = {
"17 17 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ",
" ............... ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXoXXXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXoooooXXXX ",
" .XXXXoooooooXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXXoooXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" .XXXXXXXXXXXXXX ",
" "};
include/bitmaps/obm_uparrowi deleted 100644 → 0
View file @ f250b6b5
/* XPM */
static char * obm_uparrowi[] = {
"17 17 4 1",
" s button_text c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
" ",
" ..............X ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooooooooXX ",
" .ooooooXoooooXX ",
" .oooooXXXooooXX ",
" .ooooXXXXXoooXX ",
" .oooXXXXXXXooXX ",
" .ooo..XXXo..oXX ",
" .oooooXXX.oooXX ",
" .oooooXXX.oooXX ",
" .oooooo...oooXX ",
" .ooooooooooooXX ",
" .XXXXXXXXXXXXXX ",
" XXXXXXXXXXXXXXX ",
" "};
windows/cursoricon.c
View file @ 2cc54c8c
......@@ -2109,13 +2109,15 @@ static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags )
HGLOBAL hFix;
int size;
if (!(loadflags & LR_LOADFROMFILE)) {
if (!instance) /* OEM bitmap */
if (!(loadflags & LR_LOADFROMFILE))
{
if (HIWORD((int)name)) return 0;
return USER_Driver.pLoadOEMResource( LOWORD((int)name), OEM_BITMAP );
if (!instance)
{
/* OEM bitmap: try to load the resource from user32.dll */
if (HIWORD(name)) return 0;
if ((hbitmap = USER_Driver.pLoadOEMResource( LOWORD(name), OEM_BITMAP ))) return hbitmap;
if (!(instance = GetModuleHandleA("user32.dll"))) return 0;
}
if (!(hRsrc = FindResourceW( instance, name, RT_BITMAPW ))) return 0;
if (!(handle = LoadResource( instance, hRsrc ))) return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment