X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_test.cc;h=f10c4b3bb3651532af1788ea8050ee99828a3148;hb=dca8c61a91cab29128a72f252b70f4bd9f7786ff;hp=6b4d02505d55304db41b309867a25025f2400535;hpb=9e1b25490507071087d768a8873078a1ba2a8e04;p=chaz%2Fopenbox

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index 6b4d0250..f10c4b3b 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,78 +1,36 @@
-#include "focuswidget.hh"
-#include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-int main(void) {
-  otk::OBDisplay::initialize(NULL);
-  otk::Configuration style_conf(False);
-  otk::OBTimerQueueManager *tm = new otk::OBTimerQueueManager();
-  const otk::ScreenInfo *s_info =
-    otk::OBDisplay::screenInfo(DefaultScreen(otk::OBDisplay::display));
-  otk::BImageControl *ctrl = new otk::BImageControl(tm, s_info, True, 4, 5, 200);
+#include "config.h"
 
-  otk::Style *my_style = new otk::Style(ctrl);
+#include "application.hh"
+#include "appwidget.hh"
+#include "label.hh"
+#include "button.hh"
 
-  const char *sfile = "/usr/local/share/openbox/styles/artwiz";
-  
-  style_conf.setFile(sfile);
-  style_conf.load();
-
-  my_style->load(style_conf);
-
-  otk::OtkFocusWidget foo(my_style);
-  otk::OtkFocusWidget iconb(&foo);
-  otk::OtkFocusWidget label(&foo);
-  otk::OtkFocusWidget maxb(&foo);
-  otk::OtkFocusWidget closeb(&foo);
-
-  foo.setBevelWidth(2);
-
-  // fix the width to 400. the height will be determined by the height of
-  // its children
-  foo.setWidth(400);
-  foo.setTexture(my_style->getTitleFocus());
-  foo.setUnfocusTexture(my_style->getTitleUnfocus());
-
-  // fixed size
-  iconb.resize(15, 15);
-  iconb.setTexture(my_style->getButtonFocus());
-  iconb.setUnfocusTexture(my_style->getButtonUnfocus());
+int main(int argc, char **argv) {
+  otk::Application app(argc, argv);
 
-  // fix height to 15 and let the width be calculated by its parent
-  label.setHeight(15);
-  label.setStretchableHorz(true);
-  label.setTexture(my_style->getLabelFocus());
-  label.setUnfocusTexture(my_style->getLabelUnfocus());
-
-  // fixed size
-  maxb.resize(15, 15);
-  maxb.setTexture(my_style->getButtonFocus());
-  maxb.setUnfocusTexture(my_style->getButtonUnfocus());
-
-  // fixed size
-  closeb.resize(15, 15);
-  closeb.setTexture(my_style->getButtonFocus());
-  closeb.setUnfocusTexture(my_style->getButtonUnfocus());
+  otk::AppWidget foo(&app, otk::Widget::Vertical, 3);
+  otk::Label lab(&foo);
+  otk::Label lab2(&foo);
+  otk::Button but(&foo);
+  otk::Button but2(&foo);
+  
+  foo.resize(otk::Size(100, 150));
+
+  lab.setText("Hi, I'm a sexy\nlabel!!!");
+  lab.setMaxSize(otk::Size(0,0));
+  lab2.setText("Me too!!");
+  lab2.setBorderWidth(10);
+  lab2.setBorderColor(otk::RenderStyle::style(app.screen())->buttonFocusColor());
+  but.setText("Im not the default button...");
+  but2.setText("But I AM!!");
+  but2.setHighlighted(true);
+  
 
-  // will recursively unfocus its children
-  foo.unfocus();
   foo.show();
 
-  while (1) {
-    if (XPending(otk::OBDisplay::display)) {
-      XEvent e;
-      XNextEvent(otk::OBDisplay::display, &e);
-    } 
-  }
-
-  delete my_style;
-  delete tm;
-  delete ctrl;
-
-  otk::OBDisplay::destroy();
+  app.run();
 
   return 0;
 }