X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_test.cc;h=fb4db8352df5e40f379fc06af9365340ffa4b384;hb=5dfd87b08505554688640357f3a07593f3bd9ec2;hp=987563ad812d58ac048c2ca709271af5f2270f6b;hpb=d4d15160fe81353a9f7958c1feb1821abe179a70;p=chaz%2Fopenbox

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index 987563ad..fb4db835 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,40 +1,47 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "application.hh"
 #include "focuswidget.hh"
+#include "appwidget.hh"
 #include "button.hh"
 
 int main(int argc, char **argv) {
-  otk::OtkApplication app(argc, argv);
+  otk::Application app(argc, argv);
 
-  otk::OtkFocusWidget foo(&app);
+  otk::AppWidget foo(&app);
 
   foo.resize(600, 500);
-  foo.setTexture(app.getStyle()->getTitleFocus());
-  foo.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
+  foo.setTexture(app.getStyle()->titlebarFocusBackground());
+//  foo.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
 
   foo.setBevelWidth(2);
-  foo.setDirection(otk::OtkWidget::Horizontal);
+  foo.setDirection(otk::Widget::Horizontal);
 
-  otk::OtkFocusWidget left(&foo);
-  otk::OtkFocusWidget right(&foo);
+  otk::FocusWidget left(&foo);
+  otk::FocusWidget right(&foo);
 
-  left.setDirection(otk::OtkWidget::Horizontal);
+  left.setDirection(otk::Widget::Horizontal);
   left.setStretchableVert(true);
   left.setStretchableHorz(true);
-  left.setTexture(app.getStyle()->getTitleFocus());
-  left.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
+  left.setTexture(app.getStyle()->titlebarFocusBackground());
+  left.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
  
-  right.setDirection(otk::OtkWidget::Vertical);
+  right.setDirection(otk::Widget::Vertical);
   right.setBevelWidth(10);
   right.setStretchableVert(true);
   right.setWidth(300);
-  right.setTexture(app.getStyle()->getTitleFocus());
-  right.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
-
-  otk::OtkButton iconb(&left);
+  right.setTexture(app.getStyle()->titlebarFocusBackground());
+  right.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
+  otk::Button iconb(&left);
   iconb.resize(40,20);
-  otk::OtkFocusWidget label(&left);
-  otk::OtkButton maxb(&left);
-  otk::OtkButton closeb(&left);
+
+/*  otk::FocusWidget label(&left);
+  otk::Button maxb(&left);
+  otk::Button closeb(&left);
   
   // fixed size
   iconb.setText("foo");
@@ -44,23 +51,23 @@ int main(int argc, char **argv) {
   //label.setHeight(20);
   label.setStretchableVert(true);
   label.setStretchableHorz(true);
-  label.setTexture(app.getStyle()->getLabelFocus());
-  label.setUnfocusTexture(app.getStyle()->getLabelUnfocus());
+  label.setTexture(app.getStyle()->labelFocusBackground());
+  label.setUnfocusTexture(app.getStyle()->labelUnfocusBackground());
 
   // fixed size
   maxb.setText("bar");
 
   // fixed size
   closeb.setText("fuubar");
-
-  otk::OtkFocusWidget rblef(&right);
-  otk::OtkButton rbutt1(&right);
-  otk::OtkButton rbutt2(&right);
+*/
+  otk::FocusWidget rblef(&right);
+  otk::Button rbutt1(&right);
+  otk::Button rbutt2(&right);
 
   rblef.setStretchableHorz(true);
   rblef.setHeight(50);
-  rblef.setTexture(app.getStyle()->getHandleFocus());
-  rblef.setUnfocusTexture(app.getStyle()->getHandleUnfocus());
+  rblef.setTexture(app.getStyle()->handleFocusBackground());
+  rblef.setUnfocusTexture(app.getStyle()->handleUnfocusBackground());
   
   rbutt1.setText("this is fucking tight");
   rbutt2.setText("heh, WOOP");
@@ -70,7 +77,7 @@ int main(int argc, char **argv) {
 
   foo.show();
 
-  app.exec();
+  app.run();
 
   return 0;
 }