X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMenuBar.h;h=d3b054e5c13aea7218f3cbe4bead8e382dc3a009;hb=c76fc07e0c9a1153b86ae3f7163402716ec17ccb;hp=7ce218c3ce6c4fb58b0afeb595544d1e298dbcaa;hpb=507a00d9d7800568d6e8ae91905f2b07cd2b30ae;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMenuBar.h b/lib/Interface_Icons_NDimensions/interfMenuBar.h
index 7ce218c..d3b054e 100644
--- a/lib/Interface_Icons_NDimensions/interfMenuBar.h
+++ b/lib/Interface_Icons_NDimensions/interfMenuBar.h
@@ -69,12 +69,12 @@ public:
 		//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);
+		flexsizer = new wxFlexGridSizer(5);
 		this->SetSizer(flexsizer, true);
 		this->SetAutoLayout( true );
-		
 		//first row of the sizer, the buttons are being added
-		for(int i = 0; i < (int)(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);
@@ -82,7 +82,8 @@ public:
 		}
 		//second row of the sizer, the names are being added
 		
-		for(int i = 0; i < (int)(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));
@@ -99,10 +100,9 @@ public:
 	** @param int y indicates the y coordinate where the button should be located
 	**/
 
-	virtual wxBitmapButton* getButton(std::string imgpath, int sizex, int sizey){
-		vectimgpath.push_back(imgpath);
-				
-		
+	virtual wxBitmapButton* getButton(std::string imgpath, int sizex, int sizey)
+	{
+		vectimgpath.push_back(imgpath);				
 		wxBitmap* bitmap = new wxBitmap(wxString(imgpath.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
 
 		//wxSize(sizex,sizey)
@@ -120,7 +120,8 @@ public:
 	**	@param int sizex   size of the text
 	**	@param int sizey   size of the text
 	**/
-	virtual wxStaticText* getText(std::string nom, int sizex, int sizey){
+	virtual wxStaticText* getText(std::string nom, int sizex, int sizey)
+	{
 		vectnom.push_back(nom);
 		return new wxStaticText(this, -1, wxString(nom.c_str(),wxConvUTF8), wxDefaultPosition, 
 								wxSize(sizex,sizey), wxALIGN_CENTRE, wxString(nom.c_str(),wxConvUTF8));
@@ -130,8 +131,10 @@ public:
 	**	they must be ordered in the same way as the vector that contains the image path
 	**	and name of the button. See addButton(<vect>, <vect>)
 	**/
-	virtual void setVectorFunction(std::vector<wxObjectEventFunction> vectf){
-		for(int i = 0; i < (int)(vectf.size());i++){
+	virtual void setVectorFunction(std::vector<wxObjectEventFunction> vectf)
+	{
+		for(int i = 0; i < (int)(vectf.size());i++)
+		{
 			vectfunct.push_back(vectf[i]);
 		}		
 	}