summaryrefslogtreecommitdiff
path: root/otk/style.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-12-20 15:33:58 +0000
committerDana Jansens <danakj@orodu.net>2002-12-20 15:33:58 +0000
commit06de24ec6666578759eff2b348e50f5e8e20f3bd (patch)
tree96dca3fb0fe9efa083d0030f712b1235dfbd4cef /otk/style.cc
parent723739dafe91a156fef527f3b53a483195695cf1 (diff)
more api cleanups
Diffstat (limited to 'otk/style.cc')
-rw-r--r--otk/style.cc6
1 files changed, 3 insertions, 3 deletions
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.