diff options
author | fluxgen <fluxgen> | 2002-11-27 21:52:34 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-11-27 21:52:34 (GMT) |
commit | f604debc9feb28affd8e9108f4fd897017f704bd (patch) | |
tree | 830ab111e13935d1d7a907f43ae33f311490226f /src/Slit.cc | |
parent | c9e62e7aee97862ec0e0527b4a963bc9d244e41c (diff) | |
download | fluxbox-f604debc9feb28affd8e9108f4fd897017f704bd.zip fluxbox-f604debc9feb28affd8e9108f4fd897017f704bd.tar.bz2 |
texture passed as const referens to BImageControl's renderImage
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index c4e4e7c..138af92 100644 --- a/src/Slit.cc +++ b/src/Slit.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: Slit.cc,v 1.27 2002/11/27 12:30:38 fluxgen Exp $ | 25 | // $Id: Slit.cc,v 1.28 2002/11/27 21:50:09 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -414,11 +414,10 @@ void Slit::reconfigure() { | |||
414 | 414 | ||
415 | Pixmap tmp = frame.pixmap; | 415 | Pixmap tmp = frame.pixmap; |
416 | BImageControl *image_ctrl = screen()->getImageControl(); | 416 | BImageControl *image_ctrl = screen()->getImageControl(); |
417 | const FbTk::Texture *texture = &(screen()->getTheme()->getSlitTexture()); | 417 | const FbTk::Texture &texture = screen()->getTheme()->getSlitTexture(); |
418 | if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | 418 | if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { |
419 | frame.pixmap = None; | 419 | frame.pixmap = None; |
420 | XSetWindowBackground(disp, frame.window, | 420 | XSetWindowBackground(disp, frame.window, texture.color().pixel()); |
421 | texture->color().pixel()); | ||
422 | } else { | 421 | } else { |
423 | frame.pixmap = image_ctrl->renderImage(frame.width, frame.height, | 422 | frame.pixmap = image_ctrl->renderImage(frame.width, frame.height, |
424 | texture); | 423 | texture); |