X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMenuBar.h;h=00cff41d34b816d1981e52339d64a1ee6f8f0849;hb=3ede91ddd835ef6f6eaf9e72956be7c6ebd69ad4;hp=f9879dab2cf4671c4c8f4b903d8fa60470e69053;hpb=c7aa7286e02028ade712c1284fea9439d0d3c61c;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMenuBar.h b/lib/Interface_Icons_NDimensions/interfMenuBar.h
index f9879da..00cff41 100644
--- a/lib/Interface_Icons_NDimensions/interfMenuBar.h
+++ b/lib/Interface_Icons_NDimensions/interfMenuBar.h
@@ -1,6 +1,7 @@
 #ifndef __interfMENUBARH__
 #define __interfMENUBARH__
 
+#include <string>
 #include <wx/wx.h>
 #include <vector>
 #include <wx/image.h>
@@ -10,7 +11,7 @@
 #include <wx/sizer.h>
 
 //#include "interfMainPanel.h"
-#include "wxContourEventHandler.h"
+//#include "wxContourEventHandler.h"
 
 
 class interfMenuBar :
@@ -40,12 +41,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 +57,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 +106,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 +117,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 +128,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 +140,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));
 		}
@@ -150,20 +154,20 @@ public:
 	**/
 	void onActionButtonPressed( wxCommandEvent& event )
 	{
-		if(eventHandler!=NULL)
+		if(true)//if(eventHandler!=NULL)
 		{
 			std::string theStr = std::string( ((wxButton *)event.GetEventObject())->GetName().ToAscii());
 			const char * toolCommand = theStr.c_str();
 			event.SetId( GetId() );
 			event.SetEventObject( this );
 			event.SetClientData( (void *) toolCommand);
-			eventHandler->ProcessEvent( event );
+			//eventHandler->ProcessEvent( event );
 		}
 	}
 
 	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]);
 		}
 	}
@@ -179,7 +183,7 @@ private:
 	wxFlexGridSizer* flexsizer;
 
 protected:
-	wxEvtHandler* eventHandler;
+	//wxEvtHandler* eventHandler;
 	std::string datadir;