aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
committerfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
commit35c55cdc8dc0771a07c2276d3190782b89d8a715 (patch)
tree4d0ccaaaf6165453bfe46af0bcc20ed82846041b /src/Toolbar.cc
parent8b560ddf76a0b0256a1c2ffd0cb97d91153e8192 (diff)
downloadfluxbox-35c55cdc8dc0771a07c2276d3190782b89d8a715.zip
fluxbox-35c55cdc8dc0771a07c2276d3190782b89d8a715.tar.bz2
moved Texture and Color into new files, fixed some const and pointers
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index d0bf237..7eba613 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.24 2002/07/20 09:49:57 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.25 2002/07/23 17:11:59 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -430,8 +430,8 @@ void Toolbar::reconfigure(void) {
430 frame.label_h); 430 frame.label_h);
431 431
432 Pixmap tmp = frame.base; 432 Pixmap tmp = frame.base;
433 BTexture *texture = &(screen->getToolbarStyle()->toolbar); 433 FbTk::Texture *texture = &(screen->getToolbarStyle()->toolbar);
434 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 434 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
435 frame.base = None; 435 frame.base = None;
436 XSetWindowBackground(display, frame.window, 436 XSetWindowBackground(display, frame.window,
437 texture->color().pixel()); 437 texture->color().pixel());
@@ -444,7 +444,7 @@ void Toolbar::reconfigure(void) {
444 444
445 tmp = frame.label; 445 tmp = frame.label;
446 texture = &(screen->getToolbarStyle()->window); 446 texture = &(screen->getToolbarStyle()->window);
447 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 447 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
448 frame.label = None; 448 frame.label = None;
449 XSetWindowBackground(display, frame.window_label, 449 XSetWindowBackground(display, frame.window_label,
450 texture->color().pixel()); 450 texture->color().pixel());
@@ -457,7 +457,7 @@ void Toolbar::reconfigure(void) {
457 457
458 tmp = frame.wlabel; 458 tmp = frame.wlabel;
459 texture = &(screen->getToolbarStyle()->label); 459 texture = &(screen->getToolbarStyle()->label);
460 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 460 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
461 frame.wlabel = None; 461 frame.wlabel = None;
462 XSetWindowBackground(display, frame.workspace_label, 462 XSetWindowBackground(display, frame.workspace_label,
463 texture->color().pixel()); 463 texture->color().pixel());
@@ -470,7 +470,7 @@ void Toolbar::reconfigure(void) {
470 470
471 tmp = frame.clk; 471 tmp = frame.clk;
472 texture = &(screen->getToolbarStyle()->clock); 472 texture = &(screen->getToolbarStyle()->clock);
473 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 473 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
474 frame.clk = None; 474 frame.clk = None;
475 XSetWindowBackground(display, frame.clock, 475 XSetWindowBackground(display, frame.clock,
476 texture->color().pixel()); 476 texture->color().pixel());
@@ -483,7 +483,7 @@ void Toolbar::reconfigure(void) {
483 483
484 tmp = frame.button; 484 tmp = frame.button;
485 texture = &(screen->getToolbarStyle()->button); 485 texture = &(screen->getToolbarStyle()->button);
486 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 486 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
487 frame.button = None; 487 frame.button = None;
488 488
489 frame.button_pixel = texture->color().pixel(); 489 frame.button_pixel = texture->color().pixel();
@@ -504,7 +504,7 @@ void Toolbar::reconfigure(void) {
504 504
505 tmp = frame.pbutton; 505 tmp = frame.pbutton;
506 texture = &(screen->getToolbarStyle()->pressed); 506 texture = &(screen->getToolbarStyle()->pressed);
507 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 507 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
508 frame.pbutton = None; 508 frame.pbutton = None;
509 frame.pbutton_pixel = texture->color().pixel(); 509 frame.pbutton_pixel = texture->color().pixel();
510 } else 510 } else