Feature #1772 Add licence terms for all files.

[creaContours.git] / lib / Interface_Icons_NDimensions / interfMenuBar.h

diff --git a/lib/Interface_Icons_NDimensions/interfMenuBar.h b/lib/Interface_Icons_NDimensions/interfMenuBar.h
index 28441b03d9132b4be75ee56bc46407bd48d0cc58..7ce218c3ce6c4fb58b0afeb595544d1e298dbcaa 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMenuBar.h
+++ b/lib/Interface_Icons_NDimensions/interfMenuBar.h
@@ -1,6 +1,32 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef __interfMENUBARH__
 #define __interfMENUBARH__
 
+#include <string>
 #include <wx/wx.h>
 #include <vector>
 #include <wx/image.h>
@@ -40,12 +66,15 @@ public:
                int sizex = 80;
                int sizey = 80;
        
-               flexsizer = new wxFlexGridSizer(2,vpath.size(),2,2);    
+               //RaC 11-09
+               //This constructor function as well but it is neccessary to change vpath.size() by 6
+               //flexsizer = new wxFlexGridSizer(2,vpath.size(),2,2);
+               flexsizer = new wxFlexGridSizer(6);
                this->SetSizer(flexsizer, true);
                this->SetAutoLayout( true );
                
                //first row of the sizer, the buttons are being added
-               for(int i = 0; i < vpath.size();i++){
+               for(int i = 0; i < (int)(vpath.size());i++){
                        std::string p = vpath[i];
                        wxBitmapButton* bitmapbutton = this->getButton(p, sizex, sizey);
                        flexsizer->Add(bitmapbutton,wxFIXED_MINSIZE);
@@ -53,7 +82,7 @@ public:
                }
                //second row of the sizer, the names are being added
                
-               for(int i = 0; i < vnom.size(); i++){
+               for(int i = 0; i < (int)(vnom.size()); i++){
                        //sizex = vectbutton[i]->GetSize().GetWidth();
                        std::string n = vnom[i];
                        vectbutton[i]->SetToolTip(wxString(n.c_str(),wxConvUTF8));
@@ -102,7 +131,7 @@ public:
        **      and name of the button. See addButton(<vect>, <vect>)
        **/
        virtual void setVectorFunction(std::vector<wxObjectEventFunction> vectf){
-               for(int i = 0; i < vectf.size();i++){
+               for(int i = 0; i < (int)(vectf.size());i++){
                        vectfunct.push_back(vectf[i]);
                }               
        }
@@ -113,7 +142,7 @@ public:
        **/
        virtual void connectEvents(wxEvtHandler* evtHandler){   
 
-               for(int i = 0; i < vectbutton.size();i++){
+               for(int i = 0; i < (int)(vectbutton.size());i++){
                        Connect(vectbutton[i]->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, vectfunct[i],NULL,evtHandler);
                }
        }
@@ -124,7 +153,7 @@ public:
        **/
        virtual void connectEvents(){   
 
-               for(int i = 0; i < vectbutton.size();i++){
+               for(int i = 0; i < (int)(vectbutton.size());i++){
                        Connect(vectbutton[i]->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, vectfunct[i],NULL,vecthand[i]);
                }
        }
@@ -136,7 +165,7 @@ public:
        **      @params const char      name of the button see wxContour_ActionCommandsID.h to view the commands
        **/
        virtual void setButtonName(int i, const char c){
-               if(i < vectbutton.size()){
+               if(i < (int)(vectbutton.size())){
                        std::string ac = c+"";
                        vectbutton[i]->SetName(wxString(ac.c_str(),wxConvUTF8));
                }
@@ -163,7 +192,7 @@ public:
 
        virtual void setEventHandlers(std::vector<wxEvtHandler*> hand){
 
-               for(int i = 0; i < hand.size();i++){
+               for(int i = 0; i < (int)(hand.size());i++){
                        vecthand.push_back(hand[i]);
                }
        }