From 0ba441fe8f379ec506000f7fa29f867cb6bc0d51 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 20 Jan 2003 01:53:36 +0000 Subject: remove the XImage from Surface --- otk/surface.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'otk/surface.cc') diff --git a/otk/surface.cc b/otk/surface.cc index 6cc453d4..af9da7a6 100644 --- a/otk/surface.cc +++ b/otk/surface.cc @@ -17,7 +17,6 @@ namespace otk { Surface::Surface(int screen) : _screen(screen), _size(1, 1), - _im(0), _pm(None), _xftdraw(0) { @@ -27,7 +26,6 @@ Surface::Surface(int screen) Surface::Surface(int screen, const Point &size) : _screen(screen), _size(size), - _im(0), _pm(None), _xftdraw(0) { @@ -41,13 +39,10 @@ Surface::~Surface() void Surface::createObjects() { - assert(!_im); assert(_pm == None); assert(!_xftdraw); + assert(_pm == None); assert(!_xftdraw); const ScreenInfo *info = display->screenInfo(_screen); - _im = XCreateImage(**display, info->visual(), info->depth(), - ZPixmap, 0, NULL, _size.x(), _size.y(), 32, 0); - _pm = XCreatePixmap(**display, info->rootWindow(), _size.x(), _size.y(), info->depth()); @@ -56,19 +51,13 @@ void Surface::createObjects() void Surface::destroyObjects() { - assert(_im); assert(_pm != None); assert(_xftdraw); + assert(_pm != None); assert(_xftdraw); XftDrawDestroy(_xftdraw); _xftdraw = 0; XFreePixmap(**display, _pm); _pm = None; - - // do the delete ourselves cuz we alloc it with new not malloc - delete [] _im->data; - _im->data = NULL; - XDestroyImage(_im); - _im = 0; } void Surface::setSize(int w, int h) -- cgit v1.2.3