aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/FbPixmap.cc
diff options
context:
space:
mode:
authormarkt <markt>2006-08-08 19:25:48 (GMT)
committermarkt <markt>2006-08-08 19:25:48 (GMT)
commit9b9d5a9617612928710570e024632ba62f0ff74f (patch)
tree187697534c1eee0ce1c4ce73574bc277e61b9b06 /src/FbTk/FbPixmap.cc
parente2c31b7285f4bba232547bb61f97abf29fdca34e (diff)
downloadfluxbox-9b9d5a9617612928710570e024632ba62f0ff74f.zip
fluxbox-9b9d5a9617612928710570e024632ba62f0ff74f.tar.bz2
fix some compiler warnings in gcc 4.1
Diffstat (limited to 'src/FbTk/FbPixmap.cc')
-rw-r--r--src/FbTk/FbPixmap.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 3aebd62..ea1d1c9 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -359,7 +359,7 @@ void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) {
359 Atom real_type; 359 Atom real_type;
360 int real_format; 360 int real_format;
361 unsigned long items_read, items_left; 361 unsigned long items_read, items_left;
362 unsigned long *data; 362 unsigned char *data;
363 363
364 if (XGetWindowProperty(display(), 364 if (XGetWindowProperty(display(),
365 RootWindow(display(), screen_num), 365 RootWindow(display(), screen_num),
@@ -368,7 +368,7 @@ void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) {
368 False, XA_PIXMAP, 368 False, XA_PIXMAP,
369 &real_type, &real_format, 369 &real_type, &real_format,
370 &items_read, &items_left, 370 &items_read, &items_left,
371 (unsigned char **) &data) == Success) { 371 &data) == Success) {
372 if (real_format == 32 && items_read == 1) { 372 if (real_format == 32 && items_read == 1) {
373 root_pm = (Pixmap) (*data); 373 root_pm = (Pixmap) (*data);
374 } 374 }
@@ -410,7 +410,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) {
410 Atom real_type; 410 Atom real_type;
411 int real_format; 411 int real_format;
412 unsigned long items_read, items_left; 412 unsigned long items_read, items_left;
413 unsigned long *data; 413 unsigned char *data;
414 414
415 unsigned int prop = 0; 415 unsigned int prop = 0;
416 416
@@ -435,7 +435,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) {
435 False, XA_PIXMAP, 435 False, XA_PIXMAP,
436 &real_type, &real_format, 436 &real_type, &real_format,
437 &items_read, &items_left, 437 &items_read, &items_left,
438 (unsigned char **) &data) == Success) { 438 &data) == Success) {
439 if (real_format == 32 && items_read == 1) { 439 if (real_format == 32 && items_read == 1) {
440 if (print_error && strcmp(root_prop_ids[prop], "_XSETROOT_ID") == 0) { 440 if (print_error && strcmp(root_prop_ids[prop], "_XSETROOT_ID") == 0) {
441 cerr<<error_message; 441 cerr<<error_message;