Se arreglan detalles, ya compila pero se cuelga cuando se conecta un cliente.

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

diff --git a/Constructor/item.h b/Constructor/item.h
index 900e335271b89298efa9d1db7c775f9745878759..87aaaed403ff24310b563d799c93d9734542ccd9 100644 (file)
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -3,27 +3,41 @@
 
 #include <iostream>
 #include <gtkmm/drawingarea.h>
 
 #include <iostream>
 #include <gtkmm/drawingarea.h>

+#include <gtkmm/spinbutton.h>

 #include <gtkmm/stock.h>
 #include <gtkmm.h>
 #include <gdkmm.h>
 #include <libglademm.h>
 #include "propertywnd.h"
 #include <gtkmm/stock.h>
 #include <gtkmm.h>
 #include <gdkmm.h>
 #include <libglademm.h>
 #include "propertywnd.h"

+#include "workplace.h"

 
 

+class WorkPlace;
+       

 class CItem:public Gtk::DrawingArea {
 public:
        CItem();
        CItem(const char *filename);
 class CItem:public Gtk::DrawingArea {
 public:
        CItem();
        CItem(const char *filename);

-       ~CItem();
+       virtual ~CItem();

        virtual bool on_expose_event(GdkEventExpose* event);
        virtual void on_menu_popup_propiedades();
        virtual void on_menu_popup_rotar();
        virtual void on_menu_popup_eliminar();
        virtual bool on_expose_event(GdkEventExpose* event);
        virtual void on_menu_popup_propiedades();
        virtual void on_menu_popup_rotar();
        virtual void on_menu_popup_eliminar();

+       virtual void on_menu_popup_conectar();

        Glib::RefPtr<Gdk::Pixbuf> get_image() { return image; }
        Glib::RefPtr<Gdk::Pixbuf> get_image() { return image; }

+       void set_position(int _x, int _y);
+       int get_position_x();
+       int get_position_y();
+       bool is_occupied_area(int _a, int _b);
+       void set_id(int _id);
+       int get_id();
+       WorkPlace *workplace;

 protected:
 protected:

+       int ID; 

        Gtk::Menu menu_popup;
        Gtk::Menu menu_popup;

-       Gtk::Image menu_image_delete, menu_image_rotar;
+       Gtk::Image menu_image_delete, menu_image_rotar, menu_image_propiedades, menu_image_linea;

        Glib::RefPtr<Gdk::Pixbuf> image;
        PropertyWnd *property_wnd;
        Glib::RefPtr<Gdk::Pixbuf> image;
        PropertyWnd *property_wnd;

+       int x, y;

 };
 
 #endif
 };
 
 #endif