read ChangeLog, a lot of whitespace changes. experimental use of libtool

[features.git] / src / toolbar.C

diff --git a/src/toolbar.C b/src/toolbar.C
index 7a5a68a7370ac6462e386356a15adceb5918ed2b..c63d8fa9f05d4570277f52696cf40b5b46757687 100644 (file)
--- a/src/toolbar.C
+++ b/src/toolbar.C
@@ -29,6 +29,7 @@
 #include "combox.h"
 #include "lyx_cb.h"
 #include "LyXView.h"
+#include "LyXAction.h"
 #include "support/lstrings.h"
 
 #ifdef TWO_COLOR_ICONS
@@ -471,8 +472,8 @@ void Toolbar::add(int action, bool doclean)
        toolbarItem *newItem,*tmp;
 
        if (lyxaction.isPseudoAction(action)) {
-               char const *arg;
-               kb_action act = (kb_action)lyxaction.retrieveActionArg(action, &arg);
+               string arg;
+               kb_action act = static_cast<kb_action>(lyxaction.retrieveActionArg(action, arg));
                pixmap = getPixmap(act, arg);
                help = lyxaction.helpText(act);
                help += " ";