para que lo vean

[z.facultad/75.42/plaqui.git] / Constructor / item.cpp

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 4bec05d93d57dcc623d4e12b1152914f63075e93..77eefda2ec7478d92461a98c936a57ebb2a3d507 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -1,5 +1,8 @@
 #include "item.h"
 #include "item.h"

-#include "workplace.h"
+
+bool CItem::   logic_connect = false;
+int CItem::quien = -1;
+

 
 CItem::CItem(const char *filename):Gtk::DrawingArea()
 {
 
 CItem::CItem(const char *filename):Gtk::DrawingArea()
 {


@@ -15,16 +18,16 @@ CItem::CItem()
        caudal_max = 0.0;
        is_union = true;
        is_connected = false;
        caudal_max = 0.0;
        is_union = true;
        is_connected = false;

+       is_logic =false;

        property_wnd->item = this;
        menu_image_propiedades.set(Gtk::Stock::PREFERENCES, Gtk::ICON_SIZE_MENU);
        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
        menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);
        menu_image_linea.set(Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU);
        property_wnd->item = this;
        menu_image_propiedades.set(Gtk::Stock::PREFERENCES, Gtk::ICON_SIZE_MENU);
        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
        menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);
        menu_image_linea.set(Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU);

-       Gtk::Menu::MenuList& menulist = menu_popup.items();
+       menulist = menu_popup.items();

     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Propiedades",menu_image_propiedades, SigC::slot(*this, &CItem::on_menu_popup_propiedades) ) );
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Rotar", menu_image_rotar ,SigC::slot(*this, &CItem::on_menu_popup_rotar) ) );
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Eliminar", menu_image_delete,SigC::slot(*this, &CItem::on_menu_popup_eliminar) ) ) ;
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Propiedades",menu_image_propiedades, SigC::slot(*this, &CItem::on_menu_popup_propiedades) ) );
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Rotar", menu_image_rotar ,SigC::slot(*this, &CItem::on_menu_popup_rotar) ) );
     menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Eliminar", menu_image_delete,SigC::slot(*this, &CItem::on_menu_popup_eliminar) ) ) ;

-       menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;

        menu_popup.accelerate(*this);
 }
 
        menu_popup.accelerate(*this);
 }