Updated txtwin

Grzegorz Jabłoński
1 parent 9be3d764
Showing 4 changed files with 19 additions and 12 deletions
examples05/02-txtwin/cpoint.h
examples05/02-txtwin/screen.cpp
examples05/02-txtwin/screen.h
examples05/02-txtwin/winsys.cpp
+#ifndef _CPOINT_H_
+#define _CPOINT_H_
+
 struct CPoint {
     int x;
     int y;
@@ -15,3 +18,5 @@ struct CRect {
     CPoint size;
     CRect(CPoint t1 = CPoint(), CPoint s = CPoint()) : topleft(t1), size(s){};
 };
+
+#endif /* _CPOINT_H_ */
 \ No newline at end of file
-/* screen.cpp */
+#include <ncurses.h>
 #include "screen.h"
 void init_screen()
-/* screen.h */
-#include <ncurses.h>
+#ifndef _SCREEN_H_
+#define _SCREEN_H_
 void init_screen();
 void done_screen();
 void gotoyx(int y, int x);
 int ngetch();
 void getscreensize(int& y, int& x);
+
+#endif /* _SCREEN_H_ */
 \ No newline at end of file
-#include "cpoint.h"
-#include "screen.h"
+#include <ncurses.h>
 #include <ctype.h>
 #include <list>
 #include <string>
+
+#include "cpoint.h"
+#include "screen.h"
 using namespace std;
 class CView {
@@ -118,9 +120,8 @@ class CGroup : public CView {
     CGroup(CRect g) : CView(g){};
     void paint()
     {
-        for (list<CView*>::iterator i = children.begin(); i != children.end();
-             i++)
-            (*i)->paint();
+        for (CView* i : children)
+            i->paint();
     };
     bool handleEvent(int key)
     {
@@ -141,9 +142,8 @@ class CGroup : public CView {
     };
     ~CGroup()
     {
-        for (list<CView*>::iterator i = children.begin(); i != children.end();
-             i++)
-            delete (*i);
+        for (CView* i : children)
+            delete i;
     };
 };
@@ -184,7 +184,7 @@ class CDesktop : public CGroup {
         refresh();
         while (1) {
             c = getEvent();
-            if (c == 27)
+            if (c == 27) // ESC key
                 break;
             if (handleEvent(c)) {
                 paint();