Se arregla el cliente para que compile de nuevo (NOT TESTED!)

[z.facultad/75.42/plaqui.git] / Constructor / include / constructor.h

diff --git a/Constructor/include/constructor.h b/Constructor/include/constructor.h
index 9e4fac2293098a0d6a783e21ae0f0493e11cd20b..a9c1cbf1571afe48992b475473c6c62a94266168 100644 (file)
--- a/Constructor/include/constructor.h
+++ b/Constructor/include/constructor.h
@@ -11,7 +11,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/fileselection.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/fileselection.h>

-#include <gtkmm/entry.h>
+#include <gtkmm/combo.h>

 #include "workplace.h"
 #include "item.h"
 #include "splitter.h"
 #include "workplace.h"
 #include "item.h"
 #include "splitter.h"


@@ -42,13 +42,14 @@ class Constructor : public Gtk::Window {
        Gtk::ImageMenuItem *main_menu_quit,*main_menu_new, *edit_menu_del, *edit_menu_delete_all, *main_menu_save, *main_menu_open;
        Gtk::CheckButton *chk_btn_logica;
        Gtk::FileSelection *file_selection, *file_open_selection;
        Gtk::ImageMenuItem *main_menu_quit,*main_menu_new, *edit_menu_del, *edit_menu_delete_all, *main_menu_save, *main_menu_open;
        Gtk::CheckButton *chk_btn_logica;
        Gtk::FileSelection *file_selection, *file_open_selection;

-       Gtk::Entry *combo_entry;
+       Gtk::Combo *combo_entry;

        Gtk::Dialog *dlg_connect;
        Gtk::Label *dlg_label;
        Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_drain, ico_and, ico_or, ico_not;
        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<Gtk::TargetEntry> listTargets;
        std::list<CItem *> listaItems, lista_logic_Items;
        Gtk::Dialog *dlg_connect;
        Gtk::Label *dlg_label;
        Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_drain, ico_and, ico_or, ico_not;
        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<Gtk::TargetEntry> listTargets;
        std::list<CItem *> listaItems, lista_logic_Items;

+       std::list<Glib::ustring> list_pointed;

        WorkPlace *workplace;
        bool logica;
        bool can_drop(CItem *, int , int);
        WorkPlace *workplace;
        bool logica;
        bool can_drop(CItem *, int , int);