diff options
Diffstat (limited to 'src/LayerMenu.hh')
-rw-r--r-- | src/LayerMenu.hh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/LayerMenu.hh b/src/LayerMenu.hh index 87e6ddd..1afedb5 100644 --- a/src/LayerMenu.hh +++ b/src/LayerMenu.hh | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: LayerMenu.hh,v 1.6 2003/12/03 22:12:26 fluxgen Exp $ | 23 | // $Id: LayerMenu.hh,v 1.7 2003/12/10 23:08:03 fluxgen Exp $ |
24 | 24 | ||
25 | #ifndef LAYERMENU_HH | 25 | #ifndef LAYERMENU_HH |
26 | #define LAYERMENU_HH | 26 | #define LAYERMENU_HH |
@@ -60,7 +60,7 @@ private: | |||
60 | template <typename ItemType> | 60 | template <typename ItemType> |
61 | class LayerMenu : public FbMenu { | 61 | class LayerMenu : public FbMenu { |
62 | public: | 62 | public: |
63 | LayerMenu(MenuTheme &tm, int screen_num, FbTk::ImageControl &imgctrl, | 63 | LayerMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl, |
64 | FbTk::XLayer &layer, ItemType *item, bool save_rc); | 64 | FbTk::XLayer &layer, ItemType *item, bool save_rc); |
65 | 65 | ||
66 | private: | 66 | private: |
@@ -69,9 +69,9 @@ private: | |||
69 | 69 | ||
70 | 70 | ||
71 | template <typename ItemType> | 71 | template <typename ItemType> |
72 | LayerMenu<ItemType>::LayerMenu(MenuTheme &tm, int screen_num, FbTk::ImageControl &imgctrl, | 72 | LayerMenu<ItemType>::LayerMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl, |
73 | FbTk::XLayer &layer, ItemType *item, bool save_rc): | 73 | FbTk::XLayer &layer, ItemType *item, bool save_rc): |
74 | FbMenu(tm, screen_num, imgctrl, layer), | 74 | FbMenu(tm, imgctrl, layer), |
75 | m_object(item) | 75 | m_object(item) |
76 | { | 76 | { |
77 | 77 | ||
@@ -93,18 +93,16 @@ LayerMenu<ItemType>::LayerMenu(MenuTheme &tm, int screen_num, FbTk::ImageControl | |||
93 | }; | 93 | }; |
94 | 94 | ||
95 | FbTk::RefCount<FbTk::Command> saverc_cmd(new FbTk::SimpleCommand<Fluxbox>( | 95 | FbTk::RefCount<FbTk::Command> saverc_cmd(new FbTk::SimpleCommand<Fluxbox>( |
96 | *Fluxbox::instance(), | 96 | *Fluxbox::instance(), |
97 | &Fluxbox::save_rc)); | 97 | &Fluxbox::save_rc)); |
98 | 98 | ||
99 | for (size_t i=0; i < 6; ++i) { | 99 | for (size_t i=0; i < 6; ++i) { |
100 | // TODO: fetch nls string | 100 | // TODO: fetch nls string |
101 | if (save_rc) { | 101 | if (save_rc) { |
102 | insert(new LayerMenuItem<ItemType>( | 102 | insert(new LayerMenuItem<ItemType>(layer_menuitems[i].default_str, |
103 | layer_menuitems[i].default_str, | ||
104 | m_object, layer_menuitems[i].layernum, saverc_cmd)); | 103 | m_object, layer_menuitems[i].layernum, saverc_cmd)); |
105 | } else { | 104 | } else { |
106 | insert(new LayerMenuItem<ItemType>( | 105 | insert(new LayerMenuItem<ItemType>(layer_menuitems[i].default_str, |
107 | layer_menuitems[i].default_str, | ||
108 | m_object, layer_menuitems[i].layernum)); | 106 | m_object, layer_menuitems[i].layernum)); |
109 | } | 107 | } |
110 | } | 108 | } |