aboutsummaryrefslogtreecommitdiff
path: root/src/Basemenu.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Basemenu.cc')
-rw-r--r--src/Basemenu.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 0bf729c..a603dee 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.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: Basemenu.cc,v 1.26 2002/07/19 21:18:29 fluxgen Exp $ 25// $Id: Basemenu.cc,v 1.27 2002/07/23 17:11:58 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -344,11 +344,11 @@ void Basemenu::update(void) {
344 if (menu.height < 1) menu.height = 1; 344 if (menu.height < 1) menu.height = 1;
345 345
346 Pixmap tmp; 346 Pixmap tmp;
347 BTexture *texture; 347 FbTk::Texture *texture;
348 if (title_vis) { 348 if (title_vis) {
349 tmp = menu.title_pixmap; 349 tmp = menu.title_pixmap;
350 texture = &(m_screen->getMenuStyle()->title); 350 texture = &(m_screen->getMenuStyle()->title);
351 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 351 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
352 menu.title_pixmap = None; 352 menu.title_pixmap = None;
353 XSetWindowBackground(m_display, menu.title, 353 XSetWindowBackground(m_display, menu.title,
354 texture->color().pixel()); 354 texture->color().pixel());
@@ -363,7 +363,7 @@ void Basemenu::update(void) {
363 363
364 tmp = menu.frame_pixmap; 364 tmp = menu.frame_pixmap;
365 texture = &(m_screen->getMenuStyle()->frame); 365 texture = &(m_screen->getMenuStyle()->frame);
366 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 366 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
367 menu.frame_pixmap = None; 367 menu.frame_pixmap = None;
368 XSetWindowBackground(m_display, menu.frame, 368 XSetWindowBackground(m_display, menu.frame,
369 texture->color().pixel()); 369 texture->color().pixel());
@@ -376,7 +376,7 @@ void Basemenu::update(void) {
376 376
377 tmp = menu.hilite_pixmap; 377 tmp = menu.hilite_pixmap;
378 texture = &(m_screen->getMenuStyle()->hilite); 378 texture = &(m_screen->getMenuStyle()->hilite);
379 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) 379 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID))
380 menu.hilite_pixmap = None; 380 menu.hilite_pixmap = None;
381 else 381 else
382 menu.hilite_pixmap = 382 menu.hilite_pixmap =
@@ -384,7 +384,7 @@ void Basemenu::update(void) {
384 if (tmp) m_image_ctrl->removeImage(tmp); 384 if (tmp) m_image_ctrl->removeImage(tmp);
385 385
386 tmp = menu.sel_pixmap; 386 tmp = menu.sel_pixmap;
387 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) 387 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID))
388 menu.sel_pixmap = None; 388 menu.sel_pixmap = None;
389 else { 389 else {
390 int hw = menu.item_h / 2; 390 int hw = menu.item_h / 2;