I reactivate the code to resize the InsetText on a resize event of the main

[lyx.git] / src / ToolbarDefaults.C

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 83a45ce48c41b7dd9a5ed6d05ef296ed070c3dd8..594f4bf4f7a4d869ff9ebf6e2b0f3b888c16065a 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -27,6 +27,28 @@ using std::endl;
 extern LyXAction lyxaction;
 ToolbarDefaults toolbardefaults;
 
+namespace {
+
+enum _tooltags {
+       TO_ADD = 1,
+       TO_ENDTOOLBAR,
+       TO_SEPARATOR,
+       TO_LAYOUTS,
+       TO_NEWLINE,
+       TO_LAST
+};
+
+
+struct keyword_item toolTags[TO_LAST - 1] = {
+       { "end", TO_ENDTOOLBAR },
+       { "icon", TO_ADD },
+       { "layouts", TO_LAYOUTS },
+       { "newline", TO_NEWLINE },
+       { "separator", TO_SEPARATOR }
+};
+
+} // end of anon namespace
+
 
 ToolbarDefaults::ToolbarDefaults()
 {
@@ -68,30 +90,11 @@ void ToolbarDefaults::init()
         add(LFUN_MATH_MODE);
        add(SEPARATOR);
 
-       add(LFUN_FIGURE);
+       add(LFUN_INSET_GRAPHICS);
        add(LFUN_DIALOG_TABULAR_INSERT);
 }
 
 
-enum _tooltags {
-       TO_ADD = 1,
-       TO_ENDTOOLBAR,
-        TO_SEPARATOR,
-        TO_LAYOUTS,
-        TO_NEWLINE,
-       TO_LAST
-};
-
-
-struct keyword_item toolTags[TO_LAST - 1] = {
-       { "end", TO_ENDTOOLBAR },
-       { "icon", TO_ADD },
-        { "layouts", TO_LAYOUTS },
-        { "newline", TO_NEWLINE },
-        { "separator", TO_SEPARATOR }
-};
-
-
 void ToolbarDefaults::read(LyXLex & lex) 
 {
        //consistency check
@@ -134,8 +137,6 @@ void ToolbarDefaults::read(LyXLex & lex)
                        break;
                        
                case TO_ENDTOOLBAR:
-                       // should not set automatically
-                       //set();
                        quit = true;
                        break;
                default: