using imagecontrol
This commit is contained in:
parent
7748d1a09c
commit
59e52a6906
5 changed files with 11 additions and 8 deletions
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Basemenu.cc,v 1.37 2002/11/27 22:06:06 fluxgen Exp $
|
// $Id: Basemenu.cc,v 1.38 2002/11/30 20:09:19 fluxgen Exp $
|
||||||
|
|
||||||
//use GNU extensions
|
//use GNU extensions
|
||||||
#ifndef _GNU_SOURCE
|
#ifndef _GNU_SOURCE
|
||||||
|
@ -37,6 +37,7 @@
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
#include "Basemenu.hh"
|
#include "Basemenu.hh"
|
||||||
#include "Screen.hh"
|
#include "Screen.hh"
|
||||||
|
#include "ImageControl.hh"
|
||||||
#include "StringUtil.hh"
|
#include "StringUtil.hh"
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Configmenu.cc,v 1.20 2002/10/25 21:10:58 fluxgen Exp $
|
// $Id: Configmenu.cc,v 1.21 2002/11/30 20:10:09 fluxgen Exp $
|
||||||
|
|
||||||
#include "Configmenu.hh"
|
#include "Configmenu.hh"
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@
|
||||||
#include "Screen.hh"
|
#include "Screen.hh"
|
||||||
#include "Tab.hh"
|
#include "Tab.hh"
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
|
#include "ImageControl.hh"
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
|
@ -19,12 +19,13 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: IconBar.cc,v 1.19 2002/11/27 21:46:14 fluxgen Exp $
|
// $Id: IconBar.cc,v 1.20 2002/11/30 20:10:42 fluxgen Exp $
|
||||||
|
|
||||||
#include "IconBar.hh"
|
#include "IconBar.hh"
|
||||||
#include "i18n.hh"
|
#include "i18n.hh"
|
||||||
#include "Screen.hh"
|
#include "Screen.hh"
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
|
#include "ImageControl.hh"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
|
|
@ -22,14 +22,14 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Screen.cc,v 1.86 2002/11/27 21:55:36 fluxgen Exp $
|
// $Id: Screen.cc,v 1.87 2002/11/30 20:15:27 fluxgen Exp $
|
||||||
|
|
||||||
|
|
||||||
#include "Screen.hh"
|
#include "Screen.hh"
|
||||||
|
|
||||||
#include "i18n.hh"
|
#include "i18n.hh"
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
#include "Image.hh"
|
#include "ImageControl.hh"
|
||||||
#include "Toolbar.hh"
|
#include "Toolbar.hh"
|
||||||
#include "Window.hh"
|
#include "Window.hh"
|
||||||
#include "Workspace.hh"
|
#include "Workspace.hh"
|
||||||
|
@ -283,7 +283,7 @@ resource(rm, screenname, altscreenname)
|
||||||
XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor());
|
XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor());
|
||||||
|
|
||||||
image_control =
|
image_control =
|
||||||
new BImageControl(this, true, fluxbox->colorsPerChannel(),
|
new BImageControl(scrn, true, fluxbox->colorsPerChannel(),
|
||||||
fluxbox->getCacheLife(), fluxbox->getCacheMax());
|
fluxbox->getCacheLife(), fluxbox->getCacheMax());
|
||||||
image_control->installRootColormap();
|
image_control->installRootColormap();
|
||||||
root_colormap_installed = true;
|
root_colormap_installed = true;
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: fluxbox.cc,v 1.82 2002/11/27 22:00:19 fluxgen Exp $
|
// $Id: fluxbox.cc,v 1.83 2002/11/30 20:18:35 fluxgen Exp $
|
||||||
|
|
||||||
|
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
#include "Resource.hh"
|
#include "Resource.hh"
|
||||||
#include "XrmDatabaseHelper.hh"
|
#include "XrmDatabaseHelper.hh"
|
||||||
#include "AtomHandler.hh"
|
#include "AtomHandler.hh"
|
||||||
|
#include "ImageControl.hh"
|
||||||
|
|
||||||
//Use GNU extensions
|
//Use GNU extensions
|
||||||
#ifndef _GNU_SOURCE
|
#ifndef _GNU_SOURCE
|
||||||
|
|
Loading…
Reference in a new issue