aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-17 13:33:36 (GMT)
committerfluxgen <fluxgen>2003-02-17 13:33:36 (GMT)
commitc5c5f7dca28c0f7f6da297f6aa2675d02ad123ae (patch)
treefa8f22008361de517b71f1c08c7a83a14ebb6d31 /util
parent12f1b0ed3d52e5bb21c614fd42083ee79709371a (diff)
downloadfluxbox-c5c5f7dca28c0f7f6da297f6aa2675d02ad123ae.zip
fluxbox-c5c5f7dca28c0f7f6da297f6aa2675d02ad123ae.tar.bz2
ImageControl moved to FbTk
Diffstat (limited to 'util')
-rw-r--r--util/bsetroot.cc8
-rw-r--r--util/bsetroot.hh10
2 files changed, 11 insertions, 7 deletions
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 1be584a..dd0114b 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -18,12 +18,12 @@
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20 20
21// $Id: bsetroot.cc,v 1.14 2002/12/09 23:41:54 fluxgen Exp $ 21// $Id: bsetroot.cc,v 1.15 2003/02/17 13:33:36 fluxgen Exp $
22 22
23#include "bsetroot.hh" 23#include "bsetroot.hh"
24 24
25#include "../src/i18n.hh" 25#include "../src/i18n.hh"
26#include "../src/ImageControl.hh" 26#include "../src/FbTk/ImageControl.hh"
27 27
28#ifdef HAVE_CONFIG_H 28#ifdef HAVE_CONFIG_H
29#include "config.h" 29#include "config.h"
@@ -47,9 +47,9 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
47 bool mod = false, sol = false, grd = false; 47 bool mod = false, sol = false, grd = false;
48 int mod_x = 0, mod_y = 0, i = 0; 48 int mod_x = 0, mod_y = 0, i = 0;
49 49
50 img_ctrl = new BImageControl*[getNumberOfScreens()]; 50 img_ctrl = new FbTk::ImageControl*[getNumberOfScreens()];
51 for (; i < getNumberOfScreens(); i++) { 51 for (; i < getNumberOfScreens(); i++) {
52 img_ctrl[i] = new BImageControl(i, true); 52 img_ctrl[i] = new FbTk::ImageControl(i, true);
53 } 53 }
54 54
55 for (i = 1; i < argc; i++) { 55 for (i = 1; i < argc; i++) {
diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index d2f005b..68811e6 100644
--- a/util/bsetroot.hh
+++ b/util/bsetroot.hh
@@ -18,14 +18,18 @@
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20 20
21// $Id: bsetroot.hh,v 1.4 2002/08/18 09:47:03 fluxgen Exp $ 21// $Id: bsetroot.hh,v 1.5 2003/02/17 13:33:07 fluxgen Exp $
22 22
23#ifndef BSETROOT_HH 23#ifndef BSETROOT_HH
24#define BSETROOT_HH 24#define BSETROOT_HH
25 25
26#include "../src/BaseDisplay.hh" 26#include "../src/BaseDisplay.hh"
27 27
28class BImageControl; 28namespace FbTk {
29
30class ImageControl;
31
32};
29 33
30class bsetroot : public BaseDisplay { 34class bsetroot : public BaseDisplay {
31public: 35public:
@@ -44,7 +48,7 @@ protected:
44 void handleEvent(XEvent *xe) { } 48 void handleEvent(XEvent *xe) { }
45 49
46private: 50private:
47 BImageControl **img_ctrl; 51 FbTk::ImageControl **img_ctrl;
48 Pixmap *pixmaps; 52 Pixmap *pixmaps;
49 53
50 char *fore, *back, *grad; 54 char *fore, *back, *grad;