The R Project SVN – R – Diff – /trunk/src/gnuwin32/editor.c

 void deleditordata(EditorData p){
     if (p->stealconsole)
 	fix_editor_up = FALSE;
     free(p->filename);
     free(p->title);
+    free(p->hmenu);
+    free(p->pmenu);
     free(p);
+}
 static void editor_set_title(editor c, char *title) {
     char wtitle[EDITORMAXTITLE+1];
+    }
     else {
 	enable(p->mfind);
 	enable(p->mreplace);
+    }
+    helpmenuact(p->hmenu);
+    pkgmenuact(p->pmenu);
+}
 static void editorresize(editor c, rect r)
+{
     resize(getdata(c), r);
     setdata(p->mreplace, t);
     MCHECK(m = newmenuitem("-", 0, NULL));
     MCHECK(newmenuitem(G_("GUI preferences..."), 0, menuconfig));
     /* Packages menu should go here */
+    p->pmenu = (PkgMenuItems) malloc(sizeof(struct structPkgMenuItems));
-    RguiPackageMenu();
+    RguiPackageMenu(p->pmenu);
 #ifdef USE_MDI
     newmdimenu(); /* Create and fill the 'Window' menu */
 #endif
     MCHECK(m = newmenu(G_("Help")));
     MCHECK(newmenuitem(G_("Editor"), 0, menueditorhelp));
     MCHECK(newmenuitem("-", 0, NULL));
+    p->hmenu = (HelpMenuItems) malloc(sizeof(struct structHelpMenuItems));
-    RguiCommonHelp(m);
+    RguiCommonHelp(m, p->hmenu);
     settextfont(t, editorfn);
     setresize(c, editorresize);
     setclose(c, editorclose);
     setdel(c, editordel);
+    }
     show(c);
     p = getdata(getdata(c));
     p->stealconsole = stealconsole;
+    if (stealconsole) {
-    fix_editor_up = stealconsole;
+    	fix_editor_up = TRUE;
-    if (stealconsole) eventloop(c);
+    	eventloop(c);
+    }
     return 0;
+}

The R Project SVN R

(root)/trunk/src/gnuwin32/editor.c – Rev 36252 → 36258