diff options
Diffstat (limited to 'src/MenuCreator.cc')
-rw-r--r-- | src/MenuCreator.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc index 0597d6c..baa49fb 100644 --- a/src/MenuCreator.cc +++ b/src/MenuCreator.cc | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include "defaults.hh" | 27 | #include "defaults.hh" |
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
29 | #include "FbTk/CommandRegistry.hh" | 29 | #include "FbTk/ObjectRegistry.hh" |
30 | #include "fluxbox.hh" | 30 | #include "fluxbox.hh" |
31 | #include "Window.hh" | 31 | #include "Window.hh" |
32 | #include "WindowCmd.hh" | 32 | #include "WindowCmd.hh" |
@@ -247,7 +247,7 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem, FbTk::StringConve | |||
247 | else | 247 | else |
248 | menu.insert(str_label, submenu); | 248 | menu.insert(str_label, submenu); |
249 | } else if (str_key == "exit") { // exit | 249 | } else if (str_key == "exit") { // exit |
250 | FbTk::RefCount<FbTk::Command> exit_cmd(FbTk::CommandRegistry::instance().parseLine("exit")); | 250 | FbTk::RefCount<FbTk::Command> exit_cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse("exit")); |
251 | if (str_label.empty()) | 251 | if (str_label.empty()) |
252 | menu.insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit Command"), exit_cmd); | 252 | menu.insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit Command"), exit_cmd); |
253 | else | 253 | else |
@@ -255,11 +255,11 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem, FbTk::StringConve | |||
255 | } else if (str_key == "exec") { | 255 | } else if (str_key == "exec") { |
256 | // execute and hide menu | 256 | // execute and hide menu |
257 | using namespace FbTk; | 257 | using namespace FbTk; |
258 | RefCount<Command> exec_cmd(FbTk::CommandRegistry::instance().parseLine("exec " + str_cmd)); | 258 | RefCount<Command> exec_cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse("exec " + str_cmd)); |
259 | menu.insert(str_label, exec_cmd); | 259 | menu.insert(str_label, exec_cmd); |
260 | } else if (str_key == "macrocmd") { | 260 | } else if (str_key == "macrocmd") { |
261 | using namespace FbTk; | 261 | using namespace FbTk; |
262 | RefCount<Command> macro_cmd(FbTk::CommandRegistry::instance().parseLine("macrocmd " + str_cmd)); | 262 | RefCount<Command> macro_cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse("macrocmd " + str_cmd)); |
263 | menu.insert(str_label, macro_cmd); | 263 | menu.insert(str_label, macro_cmd); |
264 | } else if (str_key == "style") { // style | 264 | } else if (str_key == "style") { // style |
265 | menu.insert(new StyleMenuItem(str_label, str_cmd)); | 265 | menu.insert(new StyleMenuItem(str_label, str_cmd)); |
@@ -354,7 +354,7 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem, FbTk::StringConve | |||
354 | else { // ok, if we didn't find any special menu item we try with command parser | 354 | else { // ok, if we didn't find any special menu item we try with command parser |
355 | // we need to attach command with arguments so command parser can parse it | 355 | // we need to attach command with arguments so command parser can parse it |
356 | string line = str_key + " " + str_cmd; | 356 | string line = str_key + " " + str_cmd; |
357 | FbTk::RefCount<FbTk::Command> command(FbTk::CommandRegistry::instance().parseLine(line)); | 357 | FbTk::RefCount<FbTk::Command> command(FbTk::ObjectRegistry<FbTk::Command>::instance().parse(line)); |
358 | if (*command != 0) { | 358 | if (*command != 0) { |
359 | // special NLS default labels | 359 | // special NLS default labels |
360 | if (str_label.empty()) { | 360 | if (str_label.empty()) { |