From 447740095b0491c84370083c0ee2bf281aa502bd Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Sun, 14 Oct 2012 13:39:47 +0200 Subject: [PATCH] Remove xedittags.c, .h from project The tiny bit of code that was left was absorbed in dialogs.c, the one prototype to menus.h. --- Makefile.am | 2 - dialogs.c | 25 +++++++++++ menus.c | 1 - menus.h | 1 + xaw/xboard.c | 1 - xaw/xedittags.c | 121 ------------------------------------------------------- xaw/xedittags.h | 30 -------------- xedittags.c | 121 ------------------------------------------------------- xedittags.h | 30 -------------- 9 files changed, 26 insertions(+), 306 deletions(-) delete mode 100644 xaw/xedittags.c delete mode 100644 xaw/xedittags.h delete mode 100644 xedittags.c delete mode 100644 xedittags.h diff --git a/Makefile.am b/Makefile.am index b56b362..abce9f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,13 +11,11 @@ endif ### define sources for the front-end and backend GTKsources = xboard.c xevalgraph.c xgamelist.c \ - xedittags.c xedittags.h \ xhistory.c xoptions.c xboard.h \ xengineoutput.c xevalgraph.h xgamelist.h \ xhistory.h Xsources = xaw/xboard.c xaw/xboard.h \ - xaw/xedittags.c xaw/xedittags.h \ xaw/xengineoutput.c \ xaw/xevalgraph.c xaw/xevalgraph.h \ xaw/xgamelist.c xaw/xgamelist.h \ diff --git a/dialogs.c b/dialogs.c index 6287a91..f5166b2 100644 --- a/dialogs.c +++ b/dialogs.c @@ -1015,6 +1015,31 @@ NewTagsPopup (char *text, char *msg) GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, 1); } +void +TagsPopUp (char *tags, char *msg) +{ + NewTagsPopup(tags, cmailMsgLoaded ? msg : NULL); +} + +void +EditTagsPopUp (char *tags, char **dest) +{ // wrapper to preserve old name used in back-end + NewTagsPopup(tags, NULL); +} + +void +TagsPopDown() +{ + PopDown(TagsDlg); + bookUp = False; +} + +void +EditTagsProc () +{ + if (bookUp || !PopDown(TagsDlg)) EditTagsEvent(); +} + //---------------------------------------------- ICS Input Box ---------------------------------- char *icsText; diff --git a/menus.c b/menus.c index 23e09ea..c0c0687 100644 --- a/menus.c +++ b/menus.c @@ -88,7 +88,6 @@ extern char *getenv(); #include "frontend.h" #include "backend.h" #include "xhistory.h" -#include "xedittags.h" #include "menus.h" #include "gettext.h" diff --git a/menus.h b/menus.h index 262a374..29ade2b 100644 --- a/menus.h +++ b/menus.h @@ -98,6 +98,7 @@ void AnalyzeModeProc P((void)); void AnalyzeFileProc P((void)); void MatchProc P((void)); void MatchOptionsProc P((void)); +void EditTagsProc P((void)); void EditCommentProc P((void)); void IcsInputBoxProc P((void)); void ChatProc P((void)); diff --git a/xaw/xboard.c b/xaw/xboard.c index 7669269..a834adf 100644 --- a/xaw/xboard.c +++ b/xaw/xboard.c @@ -203,7 +203,6 @@ extern char *getenv(); #include "xgamelist.h" #include "xhistory.h" #include "xevalgraph.h" -#include "xedittags.h" #include "menus.h" #include "board.h" #include "dialogs.h" diff --git a/xaw/xedittags.c b/xaw/xedittags.c deleted file mode 100644 index d27aca3..0000000 --- a/xaw/xedittags.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * xedittags.c -- Tags edit window, part of X front end for XBoard - * - * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - * - * ------------------------------------------------------------------------ - * - * GNU XBoard is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * GNU XBoard is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. * - * - *------------------------------------------------------------------------ - ** See the file ChangeLog for a revision history. */ - -#include "config.h" - -#include -#include -#include -#include - -#if STDC_HEADERS -# include -# include -#else /* not STDC_HEADERS */ -extern char *getenv(); -# if HAVE_STRING_H -# include -# else /* not HAVE_STRING_H */ -# include -# endif /* not HAVE_STRING_H */ -#endif /* not STDC_HEADERS */ - -#if HAVE_UNISTD_H -# include -#endif - -#include -#include -#include -#include -#if USE_XAW3D -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#else -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#include "common.h" -#include "frontend.h" -#include "backend.h" -#include "xboard.h" -#include "xedittags.h" -#include "dialogs.h" -#include "gettext.h" - -#ifdef ENABLE_NLS -# define _(s) gettext (s) -# define N_(s) gettext_noop (s) -#else -# define _(s) (s) -# define N_(s) s -#endif - -Position tagsX = -1, tagsY = -1; - -void -TagsPopUp (char *tags, char *msg) -{ - NewTagsPopup(tags, cmailMsgLoaded ? msg : NULL); -} - - -void -EditTagsPopUp (char *tags, char **dest) -{ - NewTagsPopup(tags, NULL); -} - -void -TagsPopDown() -{ - PopDown(TagsDlg); - bookUp = False; -} - -void -EditTagsProc () -{ - if (bookUp || !PopDown(TagsDlg)) EditTagsEvent(); -} diff --git a/xaw/xedittags.h b/xaw/xedittags.h deleted file mode 100644 index 6245bfd..0000000 --- a/xaw/xedittags.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * xedittags.h - * - * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - * - * ------------------------------------------------------------------------ - * - * GNU XBoard is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * GNU XBoard is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. * - * - *------------------------------------------------------------------------ - ** See the file ChangeLog for a revision history. */ - -#ifndef XB_XEDITTAGS -#define XB_XEDITTAGS - -void EditTagsProc P((void)); - -extern Widget editTagsShell, tagsShell; -#endif diff --git a/xedittags.c b/xedittags.c deleted file mode 100644 index d27aca3..0000000 --- a/xedittags.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * xedittags.c -- Tags edit window, part of X front end for XBoard - * - * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - * - * ------------------------------------------------------------------------ - * - * GNU XBoard is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * GNU XBoard is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. * - * - *------------------------------------------------------------------------ - ** See the file ChangeLog for a revision history. */ - -#include "config.h" - -#include -#include -#include -#include - -#if STDC_HEADERS -# include -# include -#else /* not STDC_HEADERS */ -extern char *getenv(); -# if HAVE_STRING_H -# include -# else /* not HAVE_STRING_H */ -# include -# endif /* not HAVE_STRING_H */ -#endif /* not STDC_HEADERS */ - -#if HAVE_UNISTD_H -# include -#endif - -#include -#include -#include -#include -#if USE_XAW3D -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#else -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#include "common.h" -#include "frontend.h" -#include "backend.h" -#include "xboard.h" -#include "xedittags.h" -#include "dialogs.h" -#include "gettext.h" - -#ifdef ENABLE_NLS -# define _(s) gettext (s) -# define N_(s) gettext_noop (s) -#else -# define _(s) (s) -# define N_(s) s -#endif - -Position tagsX = -1, tagsY = -1; - -void -TagsPopUp (char *tags, char *msg) -{ - NewTagsPopup(tags, cmailMsgLoaded ? msg : NULL); -} - - -void -EditTagsPopUp (char *tags, char **dest) -{ - NewTagsPopup(tags, NULL); -} - -void -TagsPopDown() -{ - PopDown(TagsDlg); - bookUp = False; -} - -void -EditTagsProc () -{ - if (bookUp || !PopDown(TagsDlg)) EditTagsEvent(); -} diff --git a/xedittags.h b/xedittags.h deleted file mode 100644 index 6245bfd..0000000 --- a/xedittags.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * xedittags.h - * - * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - * - * ------------------------------------------------------------------------ - * - * GNU XBoard is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * GNU XBoard is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. * - * - *------------------------------------------------------------------------ - ** See the file ChangeLog for a revision history. */ - -#ifndef XB_XEDITTAGS -#define XB_XEDITTAGS - -void EditTagsProc P((void)); - -extern Widget editTagsShell, tagsShell; -#endif -- 1.7.0.4