diff options
Diffstat (limited to 'src/Tab.cc')
-rw-r--r-- | src/Tab.cc | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -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.44 2002/11/27 13:03:04 fluxgen Exp $ | 22 | // $Id: Tab.cc,v 1.45 2002/11/27 21:51:33 fluxgen Exp $ |
23 | 23 | ||
24 | #include "Tab.hh" | 24 | #include "Tab.hh" |
25 | 25 | ||
@@ -191,13 +191,13 @@ void Tab::lower() { | |||
191 | void Tab::loadTheme() { | 191 | void Tab::loadTheme() { |
192 | BImageControl *image_ctrl = m_win->getScreen()->getImageControl(); | 192 | BImageControl *image_ctrl = m_win->getScreen()->getImageControl(); |
193 | Pixmap tmp = m_focus_pm; | 193 | Pixmap tmp = m_focus_pm; |
194 | FbTk::Texture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus); | 194 | const FbTk::Texture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus); |
195 | 195 | ||
196 | if (texture->type() & FbTk::Texture::PARENTRELATIVE ) { | 196 | if (texture->type() & FbTk::Texture::PARENTRELATIVE ) { |
197 | FbTk::Texture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus); | 197 | const FbTk::Texture &pt = m_win->getScreen()->getWindowStyle()->tab.t_focus; |
198 | if (pt->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | 198 | if (pt.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { |
199 | m_focus_pm = None; | 199 | m_focus_pm = None; |
200 | m_focus_pixel = pt->color().pixel(); | 200 | m_focus_pixel = pt.color().pixel(); |
201 | } else | 201 | } else |
202 | m_focus_pm = | 202 | m_focus_pm = |
203 | image_ctrl->renderImage(m_size_w, m_size_h, pt); | 203 | image_ctrl->renderImage(m_size_w, m_size_h, pt); |
@@ -210,7 +210,7 @@ void Tab::loadTheme() { | |||
210 | m_focus_pixel = texture->color().pixel(); | 210 | m_focus_pixel = texture->color().pixel(); |
211 | } else | 211 | } else |
212 | m_focus_pm = | 212 | m_focus_pm = |
213 | image_ctrl->renderImage(m_size_w, m_size_h, texture); | 213 | image_ctrl->renderImage(m_size_w, m_size_h, *texture); |
214 | if (tmp) image_ctrl->removeImage(tmp); | 214 | if (tmp) image_ctrl->removeImage(tmp); |
215 | } | 215 | } |
216 | 216 | ||
@@ -218,10 +218,10 @@ void Tab::loadTheme() { | |||
218 | texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus); | 218 | texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus); |
219 | 219 | ||
220 | if (texture->type() & FbTk::Texture::PARENTRELATIVE ) { | 220 | if (texture->type() & FbTk::Texture::PARENTRELATIVE ) { |
221 | FbTk::Texture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus); | 221 | const FbTk::Texture &pt = m_win->getScreen()->getWindowStyle()->tab.t_unfocus; |
222 | if (pt->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | 222 | if (pt.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { |
223 | m_unfocus_pm = None; | 223 | m_unfocus_pm = None; |
224 | m_unfocus_pixel = pt->color().pixel(); | 224 | m_unfocus_pixel = pt.color().pixel(); |
225 | } else | 225 | } else |
226 | m_unfocus_pm = | 226 | m_unfocus_pm = |
227 | image_ctrl->renderImage(m_size_w, m_size_h, pt); | 227 | image_ctrl->renderImage(m_size_w, m_size_h, pt); |
@@ -231,7 +231,7 @@ void Tab::loadTheme() { | |||
231 | m_unfocus_pixel = texture->color().pixel(); | 231 | m_unfocus_pixel = texture->color().pixel(); |
232 | } else | 232 | } else |
233 | m_unfocus_pm = | 233 | m_unfocus_pm = |
234 | image_ctrl->renderImage(m_size_w, m_size_h, texture); | 234 | image_ctrl->renderImage(m_size_w, m_size_h, *texture); |
235 | } | 235 | } |
236 | 236 | ||
237 | if (tmp) image_ctrl->removeImage(tmp); | 237 | if (tmp) image_ctrl->removeImage(tmp); |