From c5c5f7dca28c0f7f6da297f6aa2675d02ad123ae Mon Sep 17 00:00:00 2001 From: fluxgen Date: Mon, 17 Feb 2003 13:33:36 +0000 Subject: ImageControl moved to FbTk --- util/bsetroot.cc | 8 ++++---- util/bsetroot.hh | 10 +++++++--- 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 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// $Id: bsetroot.cc,v 1.14 2002/12/09 23:41:54 fluxgen Exp $ +// $Id: bsetroot.cc,v 1.15 2003/02/17 13:33:36 fluxgen Exp $ #include "bsetroot.hh" #include "../src/i18n.hh" -#include "../src/ImageControl.hh" +#include "../src/FbTk/ImageControl.hh" #ifdef HAVE_CONFIG_H #include "config.h" @@ -47,9 +47,9 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name) bool mod = false, sol = false, grd = false; int mod_x = 0, mod_y = 0, i = 0; - img_ctrl = new BImageControl*[getNumberOfScreens()]; + img_ctrl = new FbTk::ImageControl*[getNumberOfScreens()]; for (; i < getNumberOfScreens(); i++) { - img_ctrl[i] = new BImageControl(i, true); + img_ctrl[i] = new FbTk::ImageControl(i, true); } 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 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// $Id: bsetroot.hh,v 1.4 2002/08/18 09:47:03 fluxgen Exp $ +// $Id: bsetroot.hh,v 1.5 2003/02/17 13:33:07 fluxgen Exp $ #ifndef BSETROOT_HH #define BSETROOT_HH #include "../src/BaseDisplay.hh" -class BImageControl; +namespace FbTk { + +class ImageControl; + +}; class bsetroot : public BaseDisplay { public: @@ -44,7 +48,7 @@ protected: void handleEvent(XEvent *xe) { } private: - BImageControl **img_ctrl; + FbTk::ImageControl **img_ctrl; Pixmap *pixmaps; char *fore, *back, *grad; -- cgit v0.11.2