-ahi borre lo que se me escapo

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

diff --git a/Constructor/constructor.h b/Constructor/constructor.h
index 12e171217f435bd798da545356111e99d360ac68..b9297fb77b039ececdd90ae460a07c1eb428da9c 100644 (file)
--- a/Constructor/constructor.h
+++ b/Constructor/constructor.h
@@ -21,6 +21,9 @@
 #include "cistern.h"
 #include "exclusa.h"
 #include "pump.h"
 #include "cistern.h"
 #include "exclusa.h"
 #include "pump.h"

+#include "and.h"
+#include "or.h"
+#include "not.h"

 
 class Constructor : public Gtk::Window {
        public: 
 
 class Constructor : public Gtk::Window {
        public: 


@@ -31,14 +34,15 @@ class Constructor : public Gtk::Window {
        protected: 
        int id;
                // / defino los elementos de la ventana.
        protected: 
        int id;
                // / defino los elementos de la ventana.

-       Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque, *btn_bomba, *btn_exclusa, *btn_file_ok, *btn_file_cancel, *btn_check, *btn_dlg_close;
+       Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque, *btn_bomba, *btn_exclusa, *btn_file_ok, *btn_file_cancel, *btn_check, *btn_dlg_close,
+                                               *btn_and, *btn_or, *btn_not;

        Gtk::ImageMenuItem *main_menu_quit, *edit_menu_del, *main_menu_save;
        Gtk::CheckButton *chk_btn_logica;
        Gtk::FileSelection *file_selection;
        Gtk::Entry *combo_entry;
        Gtk::Dialog *dlg_connect;
        Gtk::Label *dlg_label;
        Gtk::ImageMenuItem *main_menu_quit, *edit_menu_del, *main_menu_save;
        Gtk::CheckButton *chk_btn_logica;
        Gtk::FileSelection *file_selection;
        Gtk::Entry *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;
+       Glib::RefPtr<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_and, ico_or, ico_not;

        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<Gtk::TargetEntry> listTargets;
        std::list<CItem *> listaItems;
        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<Gtk::TargetEntry> listTargets;
        std::list<CItem *> listaItems;


@@ -53,6 +57,9 @@ class Constructor : public Gtk::Window {
        virtual void on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_bomba_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_exclusa_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_bomba_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        virtual void on_btn_exclusa_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);

+       virtual void on_btn_and_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
+       virtual void on_btn_or_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
+       virtual void on_btn_not_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);

        virtual void on_main_menu_quit();
        virtual void on_main_menu_save();
        virtual void on_edit_menu_del();
        virtual void on_main_menu_quit();
        virtual void on_main_menu_save();
        virtual void on_edit_menu_del();


@@ -69,6 +76,9 @@ class Constructor : public Gtk::Window {
        virtual void on_tanque_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_bomba_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_tanque_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_bomba_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
        virtual void on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);

+       virtual void on_and_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
+       virtual void on_or_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
+       virtual void on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);

        
        virtual void on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *);
        virtual void on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);
        
        virtual void on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *);
        virtual void on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time);