diff options
| author | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 07:16:17 (GMT) |
|---|---|---|
| committer | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 07:16:17 (GMT) |
| commit | 2940869cd7cc1688be5114451380275c9a85f5d1 (patch) | |
| tree | 8200e95524356dfd45cb9ceaef0b4ea4b0816fa9 /src/Screen.cc | |
| parent | 62bcfaf0e4fd7d77873343d880fc526ec58cdaa6 (diff) | |
| download | fluxbox_pavel-2940869cd7cc1688be5114451380275c9a85f5d1.zip fluxbox_pavel-2940869cd7cc1688be5114451380275c9a85f5d1.tar.bz2 | |
merge MenuTheme with FbTk::MenuTheme
Diffstat (limited to 'src/Screen.cc')
| -rw-r--r-- | src/Screen.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 03d8fd2..a09f4d1 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | 39 | ||
| 40 | // themes | 40 | // themes |
| 41 | #include "FbWinFrameTheme.hh" | 41 | #include "FbWinFrameTheme.hh" |
| 42 | #include "MenuTheme.hh" | 42 | #include "FbTk/MenuTheme.hh" |
| 43 | #include "RootTheme.hh" | 43 | #include "RootTheme.hh" |
| 44 | #include "WinButtonTheme.hh" | 44 | #include "WinButtonTheme.hh" |
| 45 | #include "SlitTheme.hh" | 45 | #include "SlitTheme.hh" |
| @@ -357,7 +357,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
| 357 | // because winbutton need to rescale the pixmaps in winbutton theme | 357 | // because winbutton need to rescale the pixmaps in winbutton theme |
| 358 | // after fbwinframe have resized them | 358 | // after fbwinframe have resized them |
| 359 | m_winbutton_theme(new WinButtonTheme(scrn, *m_windowtheme)), | 359 | m_winbutton_theme(new WinButtonTheme(scrn, *m_windowtheme)), |
| 360 | m_menutheme(new MenuTheme(scrn)), | 360 | m_menutheme(new FbTk::MenuTheme(scrn)), |
| 361 | m_root_window(scrn), | 361 | m_root_window(scrn), |
| 362 | m_geom_window(m_root_window, | 362 | m_geom_window(m_root_window, |
| 363 | 0, 0, 10, 10, | 363 | 0, 0, 10, 10, |