X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/667418327423ba116d24751926a95a2f1235849c..ed55685399f3dd28a22f229c9f384facbed4d48d:/Constructor/src/item.cpp?ds=inline

diff --git a/Constructor/src/item.cpp b/Constructor/src/item.cpp
index de63b69..aa15a33 100644
--- a/Constructor/src/item.cpp
+++ b/Constructor/src/item.cpp
@@ -1,13 +1,15 @@
 #include "item.h"
 
-bool CItem::	logic_connect = false;
-int CItem::quien = -1;
+bool CItem::logic_connect = false;
+int CItem::gate_id = -1;
 
 
-CItem::CItem(const char *filename):Gtk::DrawingArea()
+CItem::CItem(const char *filename)
 {
 	image = Gdk::Pixbuf::create_from_file(filename);
 	set_size_request(image->get_width(), image->get_height());
+
+	add_events(Gdk::EXPOSURE_MASK);
 }
 
 CItem::CItem()
@@ -36,9 +38,24 @@ CItem::~CItem()
 	std::cout << "Item Die" << std::endl;
 }
 
+void CItem::on_realize()
+{
+	Gtk::DrawingArea::on_realize();
+	Glib::RefPtr<Gdk::Window> window = get_window();
+	gc = Gdk::GC::create(window);
+	
+	Glib::RefPtr<Gdk::Colormap> colormap = get_colormap();
+
+	red = Gdk::Color("red");
+	blue = Gdk::Color("blue");
+
+	colormap->alloc_color(red);
+	colormap->alloc_color(blue);
+}
+
 bool CItem::on_expose_event(GdkEventExpose* event)
 {
-	image->render_to_drawable ( get_window(),  get_style()->get_black_gc(), 0,  0,  0,  0,  image->get_width() ,image->get_height() , 
+	get_window()->draw_pixbuf(gc, image,  0,  0,  0,  0, image->get_width() ,image->get_height(), 
 																Gdk::RGB_DITHER_NONE, 0, 0);
 
 	// XXX Esto no deberia ser necesario! en todo caso devolves false en
@@ -62,8 +79,6 @@ void CItem::on_menu_popup_eliminar()
 
 void CItem::on_menu_popup_conectar()
 {
-	CItem::logic_connect = true;
-	CItem::quien = ID;	
 }
 
 int CItem::get_position_x()
@@ -158,3 +173,19 @@ ConnectorType CItem::get_connector_type( int _a, int _b )
 void CItem::set_default_connector()
 {
 }
+
+void CItem::get_in_logic_connect_position(int& _a, int& _b)
+{
+	_a = x;
+	_b = y;
+}
+
+void CItem::get_out_logic_connect_position(int& _a, int& _b)
+{
+	_a = x;
+	_b = y;
+}
+
+void CItem::update_logic_position()
+{
+}