From 06de24ec6666578759eff2b348e50f5e8e20f3bd Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 20 Dec 2002 15:33:58 +0000 Subject: more api cleanups --- otk/style.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'otk/style.cc') diff --git a/otk/style.cc b/otk/style.cc index a2f362ec..5aeef434 100644 --- a/otk/style.cc +++ b/otk/style.cc @@ -19,7 +19,7 @@ Style::Style() : font(NULL) Style::Style(BImageControl *ctrl) : image_control(ctrl), font(0), - screen_number(ctrl->getScreenInfo()->getScreenNumber()) + screen_number(ctrl->getScreenInfo()->screen()) { } @@ -136,7 +136,7 @@ void Style::load(const Configuration &style) { // load bevel, border and handle widths const ScreenInfo *s_info = OBDisplay::screenInfo(screen_number); - unsigned int width = s_info->getRect().width(); + unsigned int width = s_info->rect().width(); if (! style.getValue("handleWidth", handle_width) || handle_width > width/2 || handle_width == 0) @@ -160,7 +160,7 @@ void Style::load(const Configuration &style) { void Style::readDatabaseMask(const std::string &rname, PixmapMask &pixmapMask, const Configuration &style) { - Window root_window = OBDisplay::screenInfo(screen_number)->getRootWindow(); + Window root_window = OBDisplay::screenInfo(screen_number)->rootWindow(); std::string s; int hx, hy; //ignored int ret = BitmapOpenFailed; //default to failure. -- cgit v1.2.3