aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-30 20:18:35 (GMT)
committerfluxgen <fluxgen>2002-11-30 20:18:35 (GMT)
commit59e52a6906f53145b18030e8b52010706b9ed563 (patch)
tree8dc7067adf764442c75631b5a4a6d657585df308 /src
parent7748d1a09c58cf6eb608543e802a52c0e356d61e (diff)
downloadfluxbox-59e52a6906f53145b18030e8b52010706b9ed563.zip
fluxbox-59e52a6906f53145b18030e8b52010706b9ed563.tar.bz2
using imagecontrol
Diffstat (limited to 'src')
-rw-r--r--src/Basemenu.cc3
-rw-r--r--src/Configmenu.cc3
-rw-r--r--src/IconBar.cc3
-rw-r--r--src/Screen.cc6
-rw-r--r--src/fluxbox.cc4
5 files changed, 11 insertions, 8 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index d35c403..d838654 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Basemenu.cc,v 1.37 2002/11/27 22:06:06 fluxgen Exp $ 25// $Id: Basemenu.cc,v 1.38 2002/11/30 20:09:19 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -37,6 +37,7 @@
37#include "fluxbox.hh" 37#include "fluxbox.hh"
38#include "Basemenu.hh" 38#include "Basemenu.hh"
39#include "Screen.hh" 39#include "Screen.hh"
40#include "ImageControl.hh"
40#include "StringUtil.hh" 41#include "StringUtil.hh"
41 42
42#include <cstdio> 43#include <cstdio>
diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index d6a35b4..d432990 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Configmenu.cc,v 1.20 2002/10/25 21:10:58 fluxgen Exp $ 25// $Id: Configmenu.cc,v 1.21 2002/11/30 20:10:09 fluxgen Exp $
26 26
27#include "Configmenu.hh" 27#include "Configmenu.hh"
28 28
@@ -32,6 +32,7 @@
32#include "Screen.hh" 32#include "Screen.hh"
33#include "Tab.hh" 33#include "Tab.hh"
34#include "fluxbox.hh" 34#include "fluxbox.hh"
35#include "ImageControl.hh"
35 36
36#ifdef HAVE_CONFIG_H 37#ifdef HAVE_CONFIG_H
37#include "config.h" 38#include "config.h"
diff --git a/src/IconBar.cc b/src/IconBar.cc
index ad18468..9446165 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -19,12 +19,13 @@
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// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: IconBar.cc,v 1.19 2002/11/27 21:46:14 fluxgen Exp $ 22// $Id: IconBar.cc,v 1.20 2002/11/30 20:10:42 fluxgen Exp $
23 23
24#include "IconBar.hh" 24#include "IconBar.hh"
25#include "i18n.hh" 25#include "i18n.hh"
26#include "Screen.hh" 26#include "Screen.hh"
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28#include "ImageControl.hh"
28 29
29#include <algorithm> 30#include <algorithm>
30 31
diff --git a/src/Screen.cc b/src/Screen.cc
index e9c1846..296cb4e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,14 +22,14 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.86 2002/11/27 21:55:36 fluxgen Exp $ 25// $Id: Screen.cc,v 1.87 2002/11/30 20:15:27 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
29 29
30#include "i18n.hh" 30#include "i18n.hh"
31#include "fluxbox.hh" 31#include "fluxbox.hh"
32#include "Image.hh" 32#include "ImageControl.hh"
33#include "Toolbar.hh" 33#include "Toolbar.hh"
34#include "Window.hh" 34#include "Window.hh"
35#include "Workspace.hh" 35#include "Workspace.hh"
@@ -283,7 +283,7 @@ resource(rm, screenname, altscreenname)
283 XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor()); 283 XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor());
284 284
285 image_control = 285 image_control =
286 new BImageControl(this, true, fluxbox->colorsPerChannel(), 286 new BImageControl(scrn, true, fluxbox->colorsPerChannel(),
287 fluxbox->getCacheLife(), fluxbox->getCacheMax()); 287 fluxbox->getCacheLife(), fluxbox->getCacheMax());
288 image_control->installRootColormap(); 288 image_control->installRootColormap();
289 root_colormap_installed = true; 289 root_colormap_installed = true;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index dab26bd..3d707ac 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.82 2002/11/27 22:00:19 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.83 2002/11/30 20:18:35 fluxgen Exp $
26 26
27 27
28#include "fluxbox.hh" 28#include "fluxbox.hh"
@@ -40,7 +40,7 @@
40#include "Resource.hh" 40#include "Resource.hh"
41#include "XrmDatabaseHelper.hh" 41#include "XrmDatabaseHelper.hh"
42#include "AtomHandler.hh" 42#include "AtomHandler.hh"
43 43#include "ImageControl.hh"
44 44
45//Use GNU extensions 45//Use GNU extensions
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE