don't dereference NULL parent in wxMDIChildFrame dtor if it hadn't been really created

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 9182fecd2f8ca5877b273c97e852dcee65a8e5c7..34d7a5054b6b0c84d86fdae75ba73900d5d69331 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -883,7 +883,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     // Add the sorted dirs
     size_t i;
 
     // Add the sorted dirs
     size_t i;

-    for (i = 0; i < dirs.Count(); i++)
+    for (i = 0; i < dirs.GetCount(); i++)

     {
         eachFilename = dirs[i];
         path = dirName;
     {
         eachFilename = dirs[i];
         path = dirName;


@@ -912,7 +912,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     // Add the sorted filenames
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
     {
     // Add the sorted filenames
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
     {

-        for (i = 0; i < filenames.Count(); i++)
+        for (i = 0; i < filenames.GetCount(); i++)

         {
             eachFilename = filenames[i];
             path = dirName;
         {
             eachFilename = filenames[i];
             path = dirName;