X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=1c4a32a6a8bd3a33ff6b4b7c645cb02610f697b8;hb=4c71c71d57e87c5273e09976fbac5b3a2f83bc52;hp=fda65dc1fd0ec84a8881564cb0cdc5172a31cd42;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox diff --git a/otk/application.cc b/otk/application.cc index fda65dc1..1c4a32a6 100644 --- a/otk/application.cc +++ b/otk/application.cc @@ -20,15 +20,14 @@ namespace otk { Application::Application(int argc, char **argv) : EventDispatcher(), + _display(), _dockable(false), _appwidget_count(0) { (void)argc; (void)argv; - Display::initialize(0); - const ScreenInfo *s_info = - Display::screenInfo(DefaultScreen(Display::display)); + const ScreenInfo *s_info = _display.screenInfo(DefaultScreen(*_display)); _timer_manager = new TimerQueueManager(); _img_ctrl = new ImageControl(_timer_manager, s_info, True, 4, 5, 200); @@ -44,8 +43,6 @@ Application::~Application() delete _img_ctrl; delete _timer_manager; delete _style; - - Display::destroy(); } void Application::loadStyle(void)