Changeset 87

Timestamp:

11/05/09 21:39:32 (4 years ago)

Author:

knowknowledge

Message:

Merge branch 'master' of ​git://github.com/arke/Epiar

Files:

• UI/ui.cpp (modified) (2 diffs)
• common.h (modified) (1 diff)

UI/ui.cpp

@@ -10 +10 @@
 #include "Graphics/video.h"
 #include "includes.h"
+#include "common.h"
 #include "Utilities/log.h"
 
@@ -60 +61 @@
         
         // Free all widgets
-        child = children.front();       
-        while( child != NULL ){
-                children.pop_front();
-                delete child;
-                child=children.front(); 
-        }
+        std::for_each(children.begin(), children.end(), create_delete_functor());
+        children.clear();
+
+        mouseFocus = NULL;
+        keyboardFocus = NULL;
         
         Video::DisableMouse();

common.h

@@ -26 +26 @@
 #define OPTION(T, path) (convertTo<T>( optionsfile->Get(path) ))
 
+struct create_delete_functor
+{
+        template <typename T>
+        void operator()(T* _p)
+        {
+                delete _p;
+        }
+};
+
 #endif // __H_COMMON__