From 39e8e1b52ab13aa917e2631cbd540087e5fd0be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 6 Feb 2019 15:02:13 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@696 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- main.cpp | 4 ++-- src_main/console/piscreen.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main.cpp b/main.cpp index ef7fc6dd..5c17c2b1 100644 --- a/main.cpp +++ b/main.cpp @@ -4,8 +4,8 @@ class A: public PIObject { PIOBJECT(A) public: A() {} - EVENT_HANDLER1(void, handlerA1, PIString, s) {piCout << "handlerA1 s" << s;} EVENT_HANDLER1(void, handlerA1, float, f) {piCout << "handlerA1 f" << f;} + EVENT_HANDLER1(void, handlerA2, PIString, s) {piCout << "handlerA2 s" << s;} //uchar _[0x10]; }; @@ -23,7 +23,7 @@ int main() { A a; B b; CONNECTU(&b, eventB1, &a, handlerA1) - CONNECTU(&b, eventB2, &a, handlerA1) + CONNECTU(&b, eventB2, &a, handlerA2) a.dump(); b.dump(); b.eventB1(0.33); diff --git a/src_main/console/piscreen.h b/src_main/console/piscreen.h index 9fac189d..63765f1e 100644 --- a/src_main/console/piscreen.h +++ b/src_main/console/piscreen.h @@ -127,7 +127,7 @@ private: PRIVATE_DECLARATION int width, height, pwidth, pheight; int mouse_x, mouse_y; - PIVector > cells, pcells, dcells; + PIVector > cells, pcells; }; void begin();