X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/94fc2a6d3148acc30d1b0415336a1c2259632a18..ea7708f0d91b00a54cc5f136a67e9f9bd272329d:/Constructor/include/constructor.h diff --git a/Constructor/include/constructor.h b/Constructor/include/constructor.h index 044e068..a9c1cbf 100644 --- a/Constructor/include/constructor.h +++ b/Constructor/include/constructor.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #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::Entry *combo_entry; + Gtk::Combo *combo_entry; Gtk::Dialog *dlg_connect; Gtk::Label *dlg_label; Glib::RefPtr ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_drain, ico_and, ico_or, ico_not; Glib::RefPtr ico_last; std::list listTargets; std::list listaItems, lista_logic_Items; + std::list list_pointed; WorkPlace *workplace; bool logica; bool can_drop(CItem *, int , int); @@ -69,7 +70,7 @@ class Constructor : public Gtk::Window { virtual void on_main_menu_save(); virtual void on_edit_menu_del(); virtual void on_edit_menu_delete_all(); - virtual void on_chk_btn_clicked(); + virtual void on_chk_btn_logica_clicked(); virtual void on_btn_open_cancel_clicked(); virtual void on_btn_file_ok_clicked(); virtual void on_btn_file_cancel_clicked();