Fix unintialized pointer in wxCommandProcessor when

[wxWidgets.git] / contrib / src / ogl / ogldiag.cpp

diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index 932bbcdf7525964fe85b2e1de49008f7c4027815..d9deae4921dd073b82366d5afb827ceb423b27bc 100644 (file)
--- a/contrib/src/ogl/ogldiag.cpp
+++ b/contrib/src/ogl/ogldiag.cpp
@@ -24,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
-#include <wx/wxexpr.h>
+#if wxUSE_DEPRECATED
+#include <wx/deprecated/wxexpr.h>
+#endif
 
 #ifdef new
 #undef new
@@ -453,7 +455,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
       if (divisionExpr)
       {
         int i = 0;
-        wxExpr *idExpr = divisionExpr->Item(i);
+        wxExpr *idExpr = divisionExpr->Nth(i);
         while (idExpr)
         {
           long divisionId = idExpr->IntegerValue();
@@ -510,7 +512,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
             }
           }
           i ++;
-          idExpr = divisionExpr->Item(i);
+          idExpr = divisionExpr->Nth(i);
         }
       }
     }