Sort includes outside src/gromacs

[alexxy/gromacs.git] / src / programs / view / buttons.cpp

diff --git a/src/programs/view/buttons.cpp b/src/programs/view/buttons.cpp
index 5a0fc376b8904e10ff25aaf0f1c291206d86bb6d..e5157ffe424cfefdeb159617893821b62654af7e 100644 (file)
--- a/src/programs/view/buttons.cpp
+++ b/src/programs/view/buttons.cpp
@@ -1,52 +1,58 @@
 /*
+ * This file is part of the GROMACS molecular simulation package.
  *
- *                This source code is part of
- *
- *                 G   R   O   M   A   C   S
- *
- *          GROningen MAchine for Chemical Simulations
- *
- *                        VERSION 3.2.0
- * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2013, The GROMACS development team,
- * check out http://www.gromacs.org for more information.
-
- * This program 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 2
+ * Copyright (c) 2001-2013, The GROMACS development team.
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
+ *
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
  * of the License, or (at your option) any later version.
  *
- * If you want to redistribute modifications, please consider that
- * scientific software is very special. Version control is crucial -
- * bugs must be traceable. We will be happy to consider code for
- * inclusion in the official distribution, but derived work must not
- * be called official GROMACS. Details are found in the README & COPYING
- * files - if they are missing, get the official version at www.gromacs.org.
+ * GROMACS 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
+ * Lesser General Public License for more details.
  *
- * To help us fund GROMACS development, we humbly ask that you cite
- * the papers on the package - you can find them in the top README file.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  *
- * For more info, check our website at http://www.gromacs.org
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
  *
- * And Hey:
- * Gyas ROwers Mature At Cryogenic Speed
+ * To help us fund GROMACS development, we humbly ask that you cite
+ * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
-#include <sysstuff.h>
-#include <string.h>
-#include <smalloc.h>
-#include <macros.h>
-#include "x11.h"
-#include "xutil.h"
 #include "buttons.h"
-#include "stop_ani.bm"
-#include "play.bm"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <algorithm>
+
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/smalloc.h"
+
 #include "ff.bm"
+#include "play.bm"
 #include "rewind.bm"
+#include "stop_ani.bm"
+#include "x11.h"
+#include "xutil.h"
 
 static void move_bbox(t_x11 *x11, t_butbox *bbox)
 {
@@ -75,7 +81,7 @@ static void move_bbox(t_x11 *x11, t_butbox *bbox)
     }
 }
 
-static bool BBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool BBCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_butbox *bbox;
 
@@ -89,7 +95,7 @@ static bool BBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
     return false;
 }
 
-static bool VBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool VBCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     t_butbox  *vbox;
     int        y0;
@@ -111,11 +117,11 @@ static bool VBCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
 void set_vbtime(t_x11 *x11, t_butbox *vbox, char *text)
 {
     sfree(vbox->wd.text);
-    vbox->wd.text = strdup(text);
+    vbox->wd.text = gmx_strdup(text);
     ExposeWin(x11->disp, vbox->wd.self);
 }
 
-static bool ButtonCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool ButtonCallBack(t_x11 *x11, XEvent *event, Window /*w*/, void *data)
 {
     XEvent     letter;
     t_mwbut   *but;
@@ -182,7 +188,7 @@ t_butbox *init_vbox(t_x11 *x11, Window Parent, Window SendTo, unsigned long fg,
             y0+play_height+2*AIR, 1, "VCR - Control");
     vb->wd.self = XCreateSimpleWindow(x11->disp, Parent,
                                       vb->wd.x, vb->wd.y, vb->wd.width, vb->wd.height,
-                                      vb->wd.bwidth, WHITE, BLACK);
+                                      vb->wd.bwidth, fg, bg);
     x11->RegisterCallback(x11, vb->wd.self, Parent, VBCallBack, vb);
     x11->SetInputMask(x11, vb->wd.self, ExposureMask);