Fix (correct) warning about potentially uninitialized variables.

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 8714a27a8535c0bccde4b0b1e88caf38592dfdb5..8e8c012701cc96f1427ad2c964883fdb6ce88bce 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "docview.h"
 #endif
 
     #pragma implementation "docview.h"
 #endif
 


@@ -172,7 +172,7 @@ bool wxDocument::Close()
 bool wxDocument::OnCloseDocument()
 {
     // Tell all views that we're about to close
 bool wxDocument::OnCloseDocument()
 {
     // Tell all views that we're about to close

-    NotifyClosing();    
+    NotifyClosing();

     DeleteContents();
     Modify(FALSE);
     return TRUE;
     DeleteContents();
     Modify(FALSE);
     return TRUE;


@@ -183,18 +183,20 @@ bool wxDocument::OnCloseDocument()
 bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();
 bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();

+    wxList::iterator it, en;

 
 

-    wxNode *node = m_documentViews.GetFirst();
-    while (node)
+    for ( it = m_documentViews.begin(), en = m_documentViews.end();
+          it != en;
+          )

     {
     {

-        wxView *view = (wxView *)node->GetData();
+        wxView *view = (wxView *)*it;

         if (!view->Close())
             return FALSE;
 
         if (!view->Close())
             return FALSE;
 

-        wxNode *next = node->GetNext();
+        wxList::iterator next = it; ++next;

 
         delete view; // Deletes node implicitly
 
         delete view; // Deletes node implicitly

-        node = next;
+        it = next;

     }
     // If we haven't yet deleted the document (for example
     // if there were no views) then delete it.
     }
     // If we haven't yet deleted the document (for example
     // if there were no views) then delete it.


@@ -276,7 +278,7 @@ bool wxDocument::SaveAs()
     SetTitle(wxFileNameFromPath(fileName));
 
     // Notify the views that the filename has changed
     SetTitle(wxFileNameFromPath(fileName));
 
     // Notify the views that the filename has changed

-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
         wxView *view = (wxView *)node->GetData();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();


@@ -288,7 +290,7 @@ bool wxDocument::SaveAs()
     if (!OnSaveDocument(m_documentFile))
         return FALSE;
 
     if (!OnSaveDocument(m_documentFile))
         return FALSE;
 

-   // A file that doesn't use the default extension of its document template cannot be opened 
+   // A file that doesn't use the default extension of its document template cannot be opened

    // via the FileHistory, so we do not add it.
    if (docTemplate->FileMatchesTemplate(fileName))
    {
    // via the FileHistory, so we do not add it.
    if (docTemplate->FileMatchesTemplate(fileName))
    {


@@ -525,11 +527,11 @@ void wxDocument::OnChangedViewList()
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {

-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
         wxView *view = (wxView *)node->GetData();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();

-               if (view != sender)
+        if (view != sender)

             view->OnUpdate(sender, hint);
         node = node->GetNext();
     }
             view->OnUpdate(sender, hint);
         node = node->GetNext();
     }


@@ -537,7 +539,7 @@ void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 
 void wxDocument::NotifyClosing()
 {
 
 void wxDocument::NotifyClosing()
 {

-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
         wxView *view = (wxView *)node->GetData();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();


@@ -552,7 +554,7 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     if ( notifyViews )
     {
         // Notify the views that the filename has changed
     if ( notifyViews )
     {
         // Notify the views that the filename has changed

-        wxNode *node = m_documentViews.GetFirst();
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();

         while (node)
         {
             wxView *view = (wxView *)node->GetData();
         while (node)
         {
             wxView *view = (wxView *)node->GetData();


@@ -568,16 +570,14 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
 
 wxView::wxView()
 {
 
 wxView::wxView()
 {

-    //  SetDocument(doc);

     m_viewDocument = (wxDocument*) NULL;
 
     m_viewDocument = (wxDocument*) NULL;
 

-    m_viewTypeName = wxT("");

     m_viewFrame = (wxFrame *) NULL;
 }
 
 wxView::~wxView()
 {
     m_viewFrame = (wxFrame *) NULL;
 }
 
 wxView::~wxView()
 {

-//    GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+    GetDocumentManager()->ActivateView(this, FALSE);

     m_viewDocument->RemoveView(this);
 }
 
     m_viewDocument->RemoveView(this);
 }
 


@@ -586,8 +586,8 @@ bool wxView::ProcessEvent(wxEvent& event)
 {
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);
 {
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);

-    else
-        return TRUE;
+
+    return TRUE;

 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))


@@ -800,7 +800,7 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
         // Check we're really deleted
         if (m_docs.Member(doc))
             delete doc;
         // Check we're really deleted
         if (m_docs.Member(doc))
             delete doc;

-        
+

         return TRUE;
     }
     return FALSE;
         return TRUE;
     }
     return FALSE;


@@ -808,11 +808,11 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
 
 bool wxDocManager::CloseDocuments(bool force)
 {
 
 bool wxDocManager::CloseDocuments(bool force)
 {

-    wxNode *node = m_docs.GetFirst();
+    wxList::compatibility_iterator node = m_docs.GetFirst();

     while (node)
     {
         wxDocument *doc = (wxDocument *)node->GetData();
     while (node)
     {
         wxDocument *doc = (wxDocument *)node->GetData();

-        wxNode *next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         
         if (!CloseDocument(doc, force))
             return FALSE;
         
         if (!CloseDocument(doc, force))
             return FALSE;


@@ -830,11 +830,11 @@ bool wxDocManager::Clear(bool force)
     if (!CloseDocuments(force))
         return FALSE;
 
     if (!CloseDocuments(force))
         return FALSE;
 

-    wxNode *node = m_templates.GetFirst();
+    wxList::compatibility_iterator node = m_templates.GetFirst();

     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->GetData();

-        wxNode* next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         delete templ;
         node = next;
     }
         delete templ;
         node = next;
     }


@@ -952,8 +952,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.

-        wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
-        preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());

 
         wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                 wxPoint(100, 100), wxSize(600, 650));
 
         wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                 wxPoint(100, 100), wxSize(600, 650));


@@ -1110,7 +1109,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         delete[] templates;
         return (wxDocument *) NULL;
     }
         delete[] templates;
         return (wxDocument *) NULL;
     }

-    
+

     wxDocument* docToClose = NULL;
 
     // If we've reached the max number of docs, close the
     wxDocument* docToClose = NULL;
 
     // If we've reached the max number of docs, close the


@@ -1134,11 +1133,11 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                     return NULL;
                 }
             }
                     return NULL;
                 }
             }

-            
+

             wxDocTemplate *temp = templates[0];
             delete[] templates;
             wxDocument *newDoc = temp->CreateDocument(path, flags);
             wxDocTemplate *temp = templates[0];
             delete[] templates;
             wxDocument *newDoc = temp->CreateDocument(path, flags);

-            
+

             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());


@@ -1159,7 +1158,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                     return NULL;
                 }
             }
                     return NULL;
                 }
             }

-            
+

             wxDocument *newDoc = temp->CreateDocument(path, flags);
 
             if (newDoc)
             wxDocument *newDoc = temp->CreateDocument(path, flags);
 
             if (newDoc)


@@ -1175,7 +1174,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     }
 
     // Existing document
     }
 
     // Existing document

-    wxDocTemplate *temp = (wxDocTemplate *) NULL;
+    wxDocTemplate *temp;

 
     wxString path2(wxT(""));
     if (path != wxT(""))
 
     wxString path2(wxT(""));
     if (path != wxT(""))


@@ -1186,10 +1185,10 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         temp = FindTemplateForPath(path2);
         if (!temp)
         {
         temp = FindTemplateForPath(path2);
         if (!temp)
         {

-            // Since we do not add files with non-default extensions to the FileHistory this 
+            // Since we do not add files with non-default extensions to the FileHistory this

             // can only happen if the application changes the allowed templates in runtime.
             (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
             // can only happen if the application changes the allowed templates in runtime.
             (void)wxMessageBox(_("Sorry, the format for this file is unknown."),

-                                _("Open File"), 
+                                _("Open File"),

                                wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
         }
     }
                                wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
         }
     }


@@ -1207,7 +1206,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                 return NULL;
             }
         }
                 return NULL;
             }
         }

-        
+

         wxDocument *newDoc = temp->CreateDocument(path2, flags);
         if (newDoc)
         {
         wxDocument *newDoc = temp->CreateDocument(path2, flags);
         if (newDoc)
         {


@@ -1514,10 +1513,10 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             theTemplate = FindTemplateForPath(path);
         if ( !theTemplate )
         {
             theTemplate = FindTemplateForPath(path);
         if ( !theTemplate )
         {

-            // Since we do not add files with non-default extensions to the FileHistory this 
+            // Since we do not add files with non-default extensions to the FileHistory this

             // can only happen if the application changes the allowed templates in runtime.
             (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
             // can only happen if the application changes the allowed templates in runtime.
             (void)wxMessageBox(_("Sorry, the format for this file is unknown."),

-                                _("Open File"), 
+                                _("Open File"),

                                 wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
         }
     }
                                 wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
         }
     }


@@ -1527,78 +1526,57 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
 
     return theTemplate;
     }
 
     return theTemplate;

-
-#if 0
-    // In all other windowing systems, until we have more advanced
-    // file selectors, we must select the document type (template) first, and
-    // _then_ pop up the file selector.
-    wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
-    if (!temp)
-        return (wxDocTemplate *) NULL;
-
-    wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""),
-            temp->GetDefaultExtension(),
-            temp->GetFileFilter(),
-            0, wxTheApp->GetTopWindow());
-
-    if (pathTmp)
-    {
-        path = pathTmp;
-        return temp;
-    }
-    else
-        return (wxDocTemplate *) NULL;
-#endif // 0

 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {
 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {

-    wxArrayString strings(sort);
+    wxArrayString strings;

     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;

-        
-       for (i = 0; i < noTemplates; i++)
-       {
-               if (templates[i]->IsVisible())
-               {
-               int j;
+
+    for (i = 0; i < noTemplates; i++)
+    {
+        if (templates[i]->IsVisible())
+        {
+            int j;

             bool want = TRUE;
             bool want = TRUE;

-                       for (j = 0; j < n; j++)
-                       {
+            for (j = 0; j < n; j++)
+            {

                 //filter out NOT unique documents + view combinations
                 //filter out NOT unique documents + view combinations

-                               if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
+                if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&

                      templates[i]->m_viewTypeName == data[j]->m_viewTypeName
                    )
                     want = FALSE;
                      templates[i]->m_viewTypeName == data[j]->m_viewTypeName
                    )
                     want = FALSE;

-                       }
+            }

 
             if ( want )
 
             if ( want )

-                       {
-                       strings.Add(templates[i]->m_description);
-
-                               data[n] = templates[i];
-                               n ++;
-                       }
-               }
-       }  // for
-
-       if (sort)
-       {
-               // Yes, this will be slow, but template lists
-               // are typically short.
-               int j;
-               n = strings.Count();
-               for (i = 0; i < n; i++)
-               {
-                       for (j = 0; j < noTemplates; j++)
-                       {
-                               if (strings[i] == templates[j]->m_description)
-                                       data[i] = templates[j];
-                       }
-               }
-       }
+            {
+                strings.Add(templates[i]->m_description);
+
+                data[n] = templates[i];
+                n ++;
+            }
+        }
+    }  // for
+
+    if (sort)
+    {
+        strings.Sort(wxStringSortAscending);
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_description)
+                    data[i] = templates[j];
+            }
+        }
+    }

 
     wxDocTemplate *theTemplate;
 
 
     wxDocTemplate *theTemplate;
 


@@ -1634,49 +1612,50 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {

-    wxArrayString strings(sort);
+    wxArrayString strings;

     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;

-        
+

     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {

-               int j;
+            int j;

             bool want = TRUE;
             bool want = TRUE;

-                       for (j = 0; j < n; j++)
-                       {
+            for (j = 0; j < n; j++)
+            {

                 //filter out NOT unique views
                 //filter out NOT unique views

-                               if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+                if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )

                     want = FALSE;
                     want = FALSE;

-                       }
+            }

 
             if ( want )
             {
 
             if ( want )
             {

-                       strings.Add(templ->m_viewTypeName);
-                               data[n] = templ;
-                               n ++;
-                       }
+                strings.Add(templ->m_viewTypeName);
+                data[n] = templ;
+                n ++;
+            }

         }
     }
 
         }
     }
 

-       if (sort)
-       {
-               // Yes, this will be slow, but template lists
-               // are typically short.
-               int j;
-               n = strings.Count();
-               for (i = 0; i < n; i++)
-               {
-                       for (j = 0; j < noTemplates; j++)
-                       {
-                               if (strings[i] == templates[j]->m_viewTypeName)
-                                       data[i] = templates[j];
-                       }
-               }
-       }
+    if (sort)
+    {
+        strings.Sort(wxStringSortAscending);
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_viewTypeName)
+                    data[i] = templates[j];
+            }
+        }
+    }

 
     wxDocTemplate *theTemplate;
 
 
     wxDocTemplate *theTemplate;
 


@@ -1732,25 +1711,19 @@ void wxDocManager::RemoveDocument(wxDocument *doc)
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus

-void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(deleting))
-{
-    // If we're deactiving, and if we're not actually deleting the view, then
-    // don't reset the current view because we may be going to
-    // a window without a view.
-    // WHAT DID I MEAN BY THAT EXACTLY?
-    /*
-       if (deleting)
-       {
-       if (m_currentView == view)
-       m_currentView = NULL;
-       }
-       else
-     */
-    {
-        if (activate)
-            m_currentView = view;
-        else
+void wxDocManager::ActivateView(wxView *view, bool activate)
+{
+    if ( activate )
+    {
+        m_currentView = view;
+    }
+    else // deactivate
+    {
+        if ( m_currentView == view )
+        {
+            // don't keep stale pointer

             m_currentView = (wxView *) NULL;
             m_currentView = (wxView *) NULL;

+        }

     }
 }
 
     }
 }
 


@@ -1814,11 +1787,9 @@ void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_childView)
     {
 {
     if (m_childView)
     {

-        bool ans = FALSE;
-        if (!event.CanVeto())
-            ans = TRUE; // Must delete.
-        else
-            ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+        bool ans = event.CanVeto()
+                    ? m_childView->Close(FALSE) // FALSE means don't delete associated window
+                    : TRUE; // Must delete.

 
         if (ans)
         {
 
         if (ans)
         {


@@ -1878,7 +1849,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
             {
                 // remove the file from the MRU list. The user should already be notified.
                 m_docManager->RemoveFileFromHistory(n);
             {
                 // remove the file from the MRU list. The user should already be notified.
                 m_docManager->RemoveFileFromHistory(n);

-                
+

                 wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
                        filename.c_str());
             }
                 wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
                        filename.c_str());
             }


@@ -1932,8 +1903,10 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);

+    wxUnusedVar(ppiScreenY);

     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);

+    wxUnusedVar(ppiPrinterY);

 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size
 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size


@@ -1948,6 +1921,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);

+    wxUnusedVar(pageHeight);

 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.
 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.


@@ -2052,7 +2026,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {

-        wxNode* node = m_fileMenus.GetFirst();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();

         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();


@@ -2097,7 +2071,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
 
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());

-            wxNode* node = m_fileMenus.GetFirst();
+            wxList::compatibility_iterator node = m_fileMenus.GetFirst();

             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->GetData();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->GetData();


@@ -2122,7 +2096,7 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
         m_fileHistory[j] = m_fileHistory[j + 1];
     }
 
         m_fileHistory[j] = m_fileHistory[j + 1];
     }
 

-    wxNode* node = m_fileMenus.GetFirst();
+    wxList::compatibility_iterator node = m_fileMenus.GetFirst();

     while ( node )
     {
          wxMenu* menu = (wxMenu*) node->GetData();
     while ( node )
     {
          wxMenu* menu = (wxMenu*) node->GetData();


@@ -2147,7 +2121,7 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {

-            wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
+            wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast();

             if ( node )
             {
                 wxMenuItem *menuItem = node->GetData();
             if ( node )
             {
                 wxMenuItem *menuItem = node->GetData();


@@ -2217,7 +2191,7 @@ void wxFileHistory::Save(wxConfigBase& config)
         if (i < m_fileHistoryN)
             config.Write(buf, wxString(m_fileHistory[i]));
         else
         if (i < m_fileHistoryN)
             config.Write(buf, wxString(m_fileHistory[i]));
         else

-            config.Write(buf, wxEmptyString);            
+            config.Write(buf, wxEmptyString);

     }
 }
 #endif // wxUSE_CONFIG
     }
 }
 #endif // wxUSE_CONFIG


@@ -2226,7 +2200,7 @@ void wxFileHistory::AddFilesToMenu()
 {
     if (m_fileHistoryN > 0)
     {
 {
     if (m_fileHistoryN > 0)
     {

-        wxNode* node = m_fileMenus.GetFirst();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();

         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();