address some memory issues shown up with valgrind

2 files changed, 14 insertions, 15 deletions

diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index eadc701..ff01794 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventManager.cc,v 1.8 2003/08/27 00:21:54 fluxgen Exp $
+// $Id: EventManager.cc,v 1.9 2003/10/02 16:14:41 rathnor Exp $
 
 #include "EventManager.hh"
 #include "FbWindow.hh"
@@ -114,19 +114,18 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) {
     Window root, parent_win, *children = 0;
     unsigned int num_children;
     if (XQueryTree(FbTk::App::instance()->display(), win, 
-                   &root, &parent_win, &children, &num_children) != 0 && 
-        parent_win != 0 &&
-        parent_win != root) {
-
-        if (children != 0)
+                   &root, &parent_win, &children, &num_children) != 0) {
+        if (children != 0) 
             XFree(children);
 
-        if (m_parent[parent_win] == 0)
-            return;
-
-        // dispatch event to parent
-        dispatch(parent_win, ev, true);
+        if (parent_win != 0 &&
+            parent_win != root) {
+            if (m_parent[parent_win] == 0)
+                return;
 
+            // dispatch event to parent
+            dispatch(parent_win, ev, true);
+        }
     }
 
 }
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index 40a7e72..f1f1103 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextureRender.cc,v 1.4 2003/08/12 11:44:41 fluxgen Exp $
+// $Id: TextureRender.cc,v 1.5 2003/10/02 16:14:41 rathnor Exp $
 
 #include "TextureRender.hh"
 
@@ -57,7 +57,7 @@ TextureRender::TextureRender(ImageControl &imgctrl,
         height = 3200;
     }
 
-    red = new (nothrow) unsigned char[width * height];
+    red = new unsigned char[width * height];
     if (red == 0) {
         char sbuf[128];
         sprintf(sbuf, "%d", width*height);
@@ -65,14 +65,14 @@ TextureRender::TextureRender(ImageControl &imgctrl,
     }
 
 
-    green = new (nothrow)  unsigned char[width * height];
+    green = new unsigned char[width * height];
     if (green == 0) {
         char sbuf[128];
         sprintf(sbuf, "%d", width*height);
         throw string("TextureRender::TextureRender(): Out of memory while allocating green buffer. size " + string(sbuf));
     }
 
-    blue = new (nothrow) unsigned char[width * height];
+    blue = new unsigned char[width * height];
     if (blue == 0) {
         char sbuf[128];
         sprintf(sbuf, "%d", width*height);