summaryrefslogtreecommitdiff
path: root/otk/application.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-13 08:48:03 +0000
committerDana Jansens <danakj@orodu.net>2003-01-13 08:48:03 +0000
commitc97915f445017d36667a6ad32767fa41d14d23b1 (patch)
tree66ea465799a6b00ef1361a44774d4610ca6ca814 /otk/application.cc
parent9e77a88d269bfafb78e56a646bfacebdd6ff4c5a (diff)
un-static otk::Display. add an operator* to it. make a global ob::display var.
Diffstat (limited to 'otk/application.cc')
-rw-r--r--otk/application.cc7
1 files changed, 2 insertions, 5 deletions
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)