aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2010-09-20 22:05:15 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2010-09-20 22:05:15 (GMT)
commit78b09ee932c7b3d1d383c14c202b849f9814eba2 (patch)
tree6d9497c47b97dbc9169480b7f5bd0e8ed7243b4f /src
parentae7a54a4b6ddf6c8b0d16ecaa8145b2939aceec5 (diff)
downloadfluxbox_pavel-78b09ee932c7b3d1d383c14c202b849f9814eba2.zip
fluxbox_pavel-78b09ee932c7b3d1d383c14c202b849f9814eba2.tar.bz2
updated 'texturetest.cc' to work with current API
Diffstat (limited to 'src')
-rw-r--r--src/tests/texturetest.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tests/texturetest.cc b/src/tests/texturetest.cc
index 390fbb8..a9ac615 100644
--- a/src/tests/texturetest.cc
+++ b/src/tests/texturetest.cc
@@ -13,6 +13,9 @@
13#include "Font.hh" 13#include "Font.hh"
14#include "App.hh" 14#include "App.hh"
15 15
16#include <stdlib.h>
17#include <string.h>
18#include <stdio.h>
16#include <memory> 19#include <memory>
17#include <string> 20#include <string>
18 21
@@ -33,8 +36,7 @@ public:
33 m_box_size(box_size), 36 m_box_size(box_size),
34 m_num(num), 37 m_num(num),
35 m_font("fixed"), 38 m_font("fixed"),
36 m_imgctrl(screenNumber(), true, 8, 39 m_imgctrl(screenNumber()),
37 100, 100),
38 m_background(*this, 640, 480, depth()), 40 m_background(*this, 640, 480, depth()),
39 m_gc(m_background) { 41 m_gc(m_background) {
40 setName("Texture Test"); 42 setName("Texture Test");
@@ -47,7 +49,7 @@ public:
47 show(); 49 show();
48 } 50 }
49 void keyPressEvent(XKeyEvent &ev) { 51 void keyPressEvent(XKeyEvent &ev) {
50 App::instance()->end(); 52 //App::instance()->end();
51 } 53 }
52 void exposeEvent(XExposeEvent &ev) { 54 void exposeEvent(XExposeEvent &ev) {
53 clear(); 55 clear();
@@ -90,7 +92,7 @@ private:
90 string("texture") + value, 92 string("texture") + value,
91 string("Texture") + value)); 93 string("Texture") + value));
92 // load new style 94 // load new style
93 ThemeManager::instance().load("test.theme"); 95 ThemeManager::instance().load("test.theme", "");
94 96
95 renderPixmap(**text.get(), next_x, next_y); 97 renderPixmap(**text.get(), next_x, next_y);
96 98