X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_test.cc;h=fb4db8352df5e40f379fc06af9365340ffa4b384;hb=dddac554808d7352a06733938cfddc19839b99d0;hp=778f0f8f8140719dd134a5312f5c4b373944b176;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index 778f0f8f..fb4db835 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -15,8 +15,8 @@ int main(int argc, char **argv) {
   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::Widget::Horizontal);
@@ -27,19 +27,19 @@ int main(int argc, char **argv) {
   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::Widget::Vertical);
   right.setBevelWidth(10);
   right.setStretchableVert(true);
   right.setWidth(300);
-  right.setTexture(app.getStyle()->getTitleFocus());
-  right.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
-
+  right.setTexture(app.getStyle()->titlebarFocusBackground());
+  right.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
   otk::Button iconb(&left);
   iconb.resize(40,20);
-  otk::FocusWidget label(&left);
+
+/*  otk::FocusWidget label(&left);
   otk::Button maxb(&left);
   otk::Button closeb(&left);
   
@@ -51,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::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");
@@ -77,7 +77,7 @@ int main(int argc, char **argv) {
 
   foo.show();
 
-  app.exec();
+  app.run();
 
   return 0;
 }