aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-22 21:15:28 (GMT)
committerfluxgen <fluxgen>2002-07-22 21:15:28 (GMT)
commit794e2a522e9058f9a9746d4333fb4a37c64630bd (patch)
tree62ddf7cef187ee2e91eddd52e466faaa7e585227
parentd51750a4444d042200fe5e76d92cb559b6a77f9e (diff)
downloadfluxbox-794e2a522e9058f9a9746d4333fb4a37c64630bd.zip
fluxbox-794e2a522e9058f9a9746d4333fb4a37c64630bd.tar.bz2
updated to match namechanges in BImage
-rw-r--r--util/bsetroot.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index cb3bc1b..d930af2 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,13 +1,13 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "../config.h" 2# include "../config.h"
3#endif // HAVE_CONFIG_H 3#endif // HAVE_CONFIG_H
4 4
5#ifdef STDC_HEADERS 5#ifdef STDC_HEADERS
6# include <string.h> 6# include <string.h>
7# include <stdlib.h> 7# include <stdlib.h>
8#endif // STDC_HEADERS 8#endif // STDC_HEADERS
9 9
10#ifdef HAVE_STDIO_H 10#ifdef HAVE_STDIO_H
11# include <stdio.h> 11# include <stdio.h>
12#endif // HAVE_STDIO_H 12#endif // HAVE_STDIO_H
13 13
@@ -197,7 +197,7 @@ void bsetroot::solid(void) {
197 if (! c.isAllocated()) 197 if (! c.isAllocated())
198 c.setPixel(BlackPixel(getXDisplay(), screen)); 198 c.setPixel(BlackPixel(getXDisplay(), screen));
199 199
200 gcv.foreground = c.getPixel(); 200 gcv.foreground = c.pixel();
201 gc = XCreateGC(getXDisplay(), getScreenInfo(screen)->getRootWindow(), 201 gc = XCreateGC(getXDisplay(), getScreenInfo(screen)->getRootWindow(),
202 GCForeground , &gcv); 202 GCForeground , &gcv);
203 203
@@ -271,8 +271,8 @@ void bsetroot::modula(int x, int y) {
271 if (! b.isAllocated()) 271 if (! b.isAllocated())
272 b.setPixel(BlackPixel(getXDisplay(), screen)); 272 b.setPixel(BlackPixel(getXDisplay(), screen));
273 273
274 gcv.foreground = f.getPixel(); 274 gcv.foreground = f.pixel();
275 gcv.background = b.getPixel(); 275 gcv.background = b.pixel();
276 276
277 gc = XCreateGC(getXDisplay(), getScreenInfo(screen)->getRootWindow(), 277 gc = XCreateGC(getXDisplay(), getScreenInfo(screen)->getRootWindow(),
278 GCForeground | GCBackground, &gcv); 278 GCForeground | GCBackground, &gcv);
@@ -322,13 +322,13 @@ void bsetroot::gradient(void) {
322 XGCValues gcv; 322 XGCValues gcv;
323 323
324 img_ctrl[screen]->parseTexture(&texture, grad); 324 img_ctrl[screen]->parseTexture(&texture, grad);
325 img_ctrl[screen]->parseColor(texture.getColor(), fore); 325 img_ctrl[screen]->parseColor(&texture.color(), fore);
326 img_ctrl[screen]->parseColor(texture.getColorTo(), back); 326 img_ctrl[screen]->parseColor(&texture.colorTo(), back);
327 327
328 if (! texture.getColor()->isAllocated()) 328 if (! texture.color().isAllocated())
329 texture.getColor()->setPixel(WhitePixel(getXDisplay(), screen)); 329 texture.color().setPixel(WhitePixel(getXDisplay(), screen));
330 if (! texture.getColorTo()->isAllocated()) 330 if (! texture.colorTo().isAllocated())
331 texture.getColorTo()->setPixel(BlackPixel(getXDisplay(), screen)); 331 texture.colorTo().setPixel(BlackPixel(getXDisplay(), screen));
332 332
333 tmp = img_ctrl[screen]->renderImage(getScreenInfo(screen)->getWidth(), 333 tmp = img_ctrl[screen]->renderImage(getScreenInfo(screen)->getWidth(),
334 getScreenInfo(screen)->getHeight(), &texture); 334 getScreenInfo(screen)->getHeight(), &texture);