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 e0720053f1bc77213a6883ba3a7e2b7ba1fac46e..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
 


@@ -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();


@@ -525,7 +527,7 @@ 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();


@@ -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();


@@ -806,12 +808,12 @@ 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;
 


@@ -828,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;
     }


@@ -950,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));


@@ -1173,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(""))


@@ -1530,7 +1531,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 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;


@@ -1562,6 +1563,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 
     if (sort)
     {
 
     if (sort)
     {

+        strings.Sort(wxStringSortAscending);

         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;


@@ -1610,7 +1612,7 @@ 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;


@@ -1640,6 +1642,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
 
     if (sort)
     {
 
     if (sort)
     {

+        strings.Sort(wxStringSortAscending);

         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;


@@ -1784,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)
         {


@@ -1902,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


@@ -1918,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.


@@ -2022,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();


@@ -2067,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();


@@ -2092,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();


@@ -2117,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();


@@ -2196,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();