aboutsummaryrefslogtreecommitdiff
path: root/src/Tab.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
committerfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
commit35c55cdc8dc0771a07c2276d3190782b89d8a715 (patch)
tree4d0ccaaaf6165453bfe46af0bcc20ed82846041b /src/Tab.cc
parent8b560ddf76a0b0256a1c2ffd0cb97d91153e8192 (diff)
downloadfluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.zip
fluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.tar.bz2
moved Texture and Color into new files, fixed some const and pointers
Diffstat (limited to 'src/Tab.cc')
-rw-r--r--src/Tab.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Tab.cc b/src/Tab.cc
index efa5652..a98aef6 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
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: Tab.cc,v 1.28 2002/07/20 09:49:21 fluxgen Exp $ 22// $Id: Tab.cc,v 1.29 2002/07/23 17:11:59 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -189,11 +189,11 @@ void Tab::lower() {
189void Tab::loadTheme() { 189void Tab::loadTheme() {
190 BImageControl *image_ctrl = m_win->getScreen()->getImageControl(); 190 BImageControl *image_ctrl = m_win->getScreen()->getImageControl();
191 Pixmap tmp = m_focus_pm; 191 Pixmap tmp = m_focus_pm;
192 BTexture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus); 192 FbTk::Texture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus);
193 193
194 if (texture->getTexture() & BImage::PARENTRELATIVE ) { 194 if (texture->type() & FbTk::Texture::PARENTRELATIVE ) {
195 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus); 195 FbTk::Texture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus);
196 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { 196 if (pt->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
197 m_focus_pm = None; 197 m_focus_pm = None;
198 m_focus_pixel = pt->color().pixel(); 198 m_focus_pixel = pt->color().pixel();
199 } else 199 } else
@@ -203,7 +203,7 @@ void Tab::loadTheme() {
203 if (tmp) image_ctrl->removeImage(tmp); 203 if (tmp) image_ctrl->removeImage(tmp);
204 204
205 } else { 205 } else {
206 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 206 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
207 m_focus_pm = None; 207 m_focus_pm = None;
208 m_focus_pixel = texture->color().pixel(); 208 m_focus_pixel = texture->color().pixel();
209 } else 209 } else
@@ -215,16 +215,16 @@ void Tab::loadTheme() {
215 tmp = m_unfocus_pm; 215 tmp = m_unfocus_pm;
216 texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus); 216 texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus);
217 217
218 if (texture->getTexture() & BImage::PARENTRELATIVE ) { 218 if (texture->type() & FbTk::Texture::PARENTRELATIVE ) {
219 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus); 219 FbTk::Texture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus);
220 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { 220 if (pt->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
221 m_unfocus_pm = None; 221 m_unfocus_pm = None;
222 m_unfocus_pixel = pt->color().pixel(); 222 m_unfocus_pixel = pt->color().pixel();
223 } else 223 } else
224 m_unfocus_pm = 224 m_unfocus_pm =
225 image_ctrl->renderImage(m_size_w, m_size_h, pt); 225 image_ctrl->renderImage(m_size_w, m_size_h, pt);
226 } else { 226 } else {
227 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 227 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
228 m_unfocus_pm = None; 228 m_unfocus_pm = None;
229 m_unfocus_pixel = texture->color().pixel(); 229 m_unfocus_pixel = texture->color().pixel();
230 } else 230 } else