fixed reverted #if condition around wxDoLogTraceWchar

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 3e1167c0f0aeb41ef7d36f6079f266bbb1577647..41b31fb23ed45eca6d70b62f05bf9af8dff85fed 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 

+#include "wx/docview.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"


@@ -37,6 +39,9 @@
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/msgdlg.h"
+    #include "wx/mdi.h"
+    #include "wx/choicdlg.h"

 #endif
 
 #include "wx/ffile.h"
 #endif
 
 #include "wx/ffile.h"


@@ -45,22 +50,16 @@
     #include "wx/filename.h"
 #endif
 
     #include "wx/filename.h"
 #endif
 

-#ifdef __WXGTK__
-    #include "wx/mdi.h"
-#endif
-

 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/prntbase.h"
     #include "wx/printdlg.h"
 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/prntbase.h"
     #include "wx/printdlg.h"
 #endif
 

-#include "wx/msgdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/docview.h"

 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"
 #include "wx/tokenzr.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"
 #include "wx/tokenzr.h"

+#include "wx/filename.h"

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -97,7 +96,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 // function prototypes
 // ----------------------------------------------------------------------------
 
 // function prototypes
 // ----------------------------------------------------------------------------
 

-static inline wxString FindExtension(const wxChar *path);

 static wxWindow* wxFindSuitableParent(void);
 
 // ----------------------------------------------------------------------------
 static wxWindow* wxFindSuitableParent(void);
 
 // ----------------------------------------------------------------------------


@@ -276,7 +274,7 @@ bool wxDocument::SaveAs()
 
     if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
     {
 
     if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
     {

-        wxList::compatibility_iterator node = wxDocManager::GetDocumentManager()->GetTemplates().GetFirst();
+        wxList::compatibility_iterator node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst();

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


@@ -304,7 +302,7 @@ bool wxDocument::SaveAs()
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             filter,
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             filter,

-            wxSAVE | wxOVERWRITE_PROMPT,
+            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,

             GetDocumentWindow());
 
     if (tmp.empty())
             GetDocumentWindow());
 
     if (tmp.empty())


@@ -1925,6 +1923,11 @@ BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
     EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 

+wxDocParentFrame::wxDocParentFrame()
+{
+    m_docManager = NULL;
+}
+

 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
                                    wxFrame *frame,
                                    wxWindowID id,
 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
                                    wxFrame *frame,
                                    wxWindowID id,


@@ -1938,6 +1941,19 @@ wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
     m_docManager = manager;
 }
 
     m_docManager = manager;
 }
 

+bool wxDocParentFrame::Create(wxDocManager *manager,
+                              wxFrame *frame,
+                              wxWindowID id,
+                              const wxString& title,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name)
+{
+    m_docManager = manager;
+    return base_type::Create(frame, id, title, pos, size, style, name);
+}
+

 void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
     Close();
 void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
     Close();


@@ -2070,50 +2086,28 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 // File history processor
 // ----------------------------------------------------------------------------
 
 // File history processor
 // ----------------------------------------------------------------------------
 

-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-
-static inline wxChar* MYcopystring(const wxChar* s)
-{
-    wxChar* copy = new wxChar[wxStrlen(s) + 1];
-    return wxStrcpy(copy, s);
-}
-

 wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
 {
     m_fileMaxFiles = maxFiles;
     m_idBase = idBase;
 wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
 {
     m_fileMaxFiles = maxFiles;
     m_idBase = idBase;

-    m_fileHistoryN = 0;
-    m_fileHistory = new wxChar *[m_fileMaxFiles];

 }
 
 wxFileHistory::~wxFileHistory()
 {
 }
 
 wxFileHistory::~wxFileHistory()
 {

-    size_t i;
-    for (i = 0; i < m_fileHistoryN; i++)
-        delete[] m_fileHistory[i];
-    delete[] m_fileHistory;

 }
 
 }
 

-// File history management

 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {

+    wxFileName fn(file);

     size_t i;
 
     // Check we don't already have this file
     size_t i;
 
     // Check we don't already have this file

-    for (i = 0; i < m_fileHistoryN; i++)
+    for (i = 0; i < m_fileHistory.GetCount(); i++)

     {
     {

-#if defined( __WXMSW__ ) // Add any other OSes with case insensitive file names
-        wxString testString;
-        if ( m_fileHistory[i] )
-            testString = m_fileHistory[i];
-        if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) )
-#else
-        if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) )
-#endif
+        // we need to do a comparison using wxFileNames because it knows
+        // how to exactly compare files on the different platforms
+        // (e.g. handle case [in]sensitive filesystems)
+        if ( fn == wxFileName(m_fileHistory[i]) )

         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory (i);
         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory (i);


@@ -2123,43 +2117,36 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     }
 
     // if we already have a full history, delete the one at the end
     }
 
     // if we already have a full history, delete the one at the end

-    if ( m_fileMaxFiles == m_fileHistoryN )
+    if ( m_fileMaxFiles == m_fileHistory.GetCount() )

     {
     {

-        RemoveFileFromHistory (m_fileHistoryN - 1);
+        RemoveFileFromHistory (m_fileHistory.GetCount() - 1);

         AddFileToHistory (file);
         return;
     }
 
     // Add to the project file history:
     // Move existing files (if any) down so we can insert file at beginning.
         AddFileToHistory (file);
         return;
     }
 
     // Add to the project file history:
     // Move existing files (if any) down so we can insert file at beginning.

-    if (m_fileHistoryN < m_fileMaxFiles)
+    if (m_fileHistory.GetCount() < m_fileMaxFiles)

     {
         wxList::compatibility_iterator node = m_fileMenus.GetFirst();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
     {
         wxList::compatibility_iterator node = m_fileMenus.GetFirst();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();

-            if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() )
+            if ( m_fileHistory.IsEmpty() && menu->GetMenuItemCount() )

             {
                 menu->AppendSeparator();
             }
             {
                 menu->AppendSeparator();
             }

-            menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]"));
+            menu->Append(m_idBase+m_fileHistory.GetCount(), _("[EMPTY]"));

             node = node->GetNext();
         }
             node = node->GetNext();
         }

-        m_fileHistoryN ++;
-    }
-    // Shuffle filenames down
-    for (i = (m_fileHistoryN-1); i > 0; i--)
-    {
-        m_fileHistory[i] = m_fileHistory[i-1];

     }
     }

-    m_fileHistory[0] = MYcopystring(file);
+
+    m_fileHistory.Insert(file, 0);

 
     // this is the directory of the last opened file
     wxString pathCurrent;
     wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );
 
     // this is the directory of the last opened file
     wxString pathCurrent;
     wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );

-    for (i = 0; i < m_fileHistoryN; i++)
-    {
-        if ( m_fileHistory[i] )
+    for (i = 0; i < m_fileHistory.GetCount(); i++)

         {
             // if in same directory just show the filename; otherwise the full
             // path
         {
             // if in same directory just show the filename; otherwise the full
             // path


@@ -2179,8 +2166,10 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 
             // we need to quote '&' characters which are used for mnemonics
             pathInMenu.Replace(_T("&"), _T("&&"));
 
             // we need to quote '&' characters which are used for mnemonics
             pathInMenu.Replace(_T("&"), _T("&&"));

+

             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());

+

             wxList::compatibility_iterator node = m_fileMenus.GetFirst();
             while (node)
             {
             wxList::compatibility_iterator node = m_fileMenus.GetFirst();
             while (node)
             {


@@ -2189,22 +2178,15 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
                 node = node->GetNext();
             }
         }
                 node = node->GetNext();
             }
         }

-    }

 }
 
 void wxFileHistory::RemoveFileFromHistory(size_t i)
 {
 }
 
 void wxFileHistory::RemoveFileFromHistory(size_t i)
 {

-    wxCHECK_RET( i < m_fileHistoryN,
+    wxCHECK_RET( i < m_fileHistory.GetCount(),

                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 
                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 

-    // delete the element from the array (could use memmove() too...)
-    delete [] m_fileHistory[i];
-
-    size_t j;
-    for ( j = i; j < m_fileHistoryN - 1; j++ )
-    {
-        m_fileHistory[j] = m_fileHistory[j + 1];
-    }
+    // delete the element from the array 
+    m_fileHistory.RemoveAt(i);

 
     wxList::compatibility_iterator node = m_fileMenus.GetFirst();
     while ( node )
 
     wxList::compatibility_iterator node = m_fileMenus.GetFirst();
     while ( node )


@@ -2213,23 +2195,23 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
 
         // shuffle filenames up
         wxString buf;
 
         // shuffle filenames up
         wxString buf;

-        for ( j = i; j < m_fileHistoryN - 1; j++ )
+        for ( size_t j = i; j < m_fileHistory.GetCount(); j++ )

         {
         {

-            buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
+            buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j].c_str());

             menu->SetLabel(m_idBase + j, buf);
         }
 
         node = node->GetNext();
 
         // delete the last menu item which is unused now
             menu->SetLabel(m_idBase + j, buf);
         }
 
         node = node->GetNext();
 
         // delete the last menu item which is unused now

-        wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistoryN) - 1;
+        wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistory.GetCount());

         if (menu->FindItem(lastItemId))
         {
             menu->Delete(lastItemId);
         }
 
         // delete the last separator too if no more files are left
         if (menu->FindItem(lastItemId))
         {
             menu->Delete(lastItemId);
         }
 
         // delete the last separator too if no more files are left

-        if ( m_fileHistoryN == 1 )
+        if ( m_fileHistory.GetCount() == 0 )

         {
             wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast();
             if ( nodeLast )
         {
             wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast();
             if ( nodeLast )


@@ -2244,23 +2226,6 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
             //else: menu is empty somehow
         }
     }
             //else: menu is empty somehow
         }
     }

-
-    m_fileHistoryN--;
-}
-
-wxString wxFileHistory::GetHistoryFile(size_t i) const
-{
-    wxString s;
-    if ( i < m_fileHistoryN )
-    {
-        s = m_fileHistory[i];
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") );
-    }
-
-    return s;

 }
 
 void wxFileHistory::UseMenu(wxMenu *menu)
 }
 
 void wxFileHistory::UseMenu(wxMenu *menu)


@@ -2277,17 +2242,21 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
 #if wxUSE_CONFIG
 void wxFileHistory::Load(wxConfigBase& config)
 {
 #if wxUSE_CONFIG
 void wxFileHistory::Load(wxConfigBase& config)
 {

-    m_fileHistoryN = 0;
+    m_fileHistory.Clear();
+

     wxString buf;
     wxString buf;

-    buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
+    buf.Printf(wxT("file%d"), 1);
+

     wxString historyFile;
     wxString historyFile;

-    while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (!historyFile.empty()))
+    while ((m_fileHistory.GetCount() < m_fileMaxFiles) && 
+           config.Read(buf, &historyFile) && !historyFile.empty())

     {
     {

-        m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
-        m_fileHistoryN ++;
-        buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
+        m_fileHistory.Add(historyFile);
+
+        buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1);

         historyFile = wxEmptyString;
     }
         historyFile = wxEmptyString;
     }

+

     AddFilesToMenu();
 }
 
     AddFilesToMenu();
 }
 


@@ -2298,7 +2267,7 @@ void wxFileHistory::Save(wxConfigBase& config)
     {
         wxString buf;
         buf.Printf(wxT("file%d"), (int)i+1);
     {
         wxString buf;
         buf.Printf(wxT("file%d"), (int)i+1);

-        if (i < m_fileHistoryN)
+        if (i < m_fileHistory.GetCount())

             config.Write(buf, wxString(m_fileHistory[i]));
         else
             config.Write(buf, wxEmptyString);
             config.Write(buf, wxString(m_fileHistory[i]));
         else
             config.Write(buf, wxEmptyString);


@@ -2308,7 +2277,7 @@ void wxFileHistory::Save(wxConfigBase& config)
 
 void wxFileHistory::AddFilesToMenu()
 {
 
 void wxFileHistory::AddFilesToMenu()
 {

-    if (m_fileHistoryN > 0)
+    if (m_fileHistory.GetCount() > 0)

     {
         wxList::compatibility_iterator node = m_fileMenus.GetFirst();
         while (node)
     {
         wxList::compatibility_iterator node = m_fileMenus.GetFirst();
         while (node)


@@ -2320,15 +2289,12 @@ void wxFileHistory::AddFilesToMenu()
             }
 
             size_t i;
             }
 
             size_t i;

-            for (i = 0; i < m_fileHistoryN; i++)
-            {
-                if (m_fileHistory[i])
+            for (i = 0; i < m_fileHistory.GetCount(); i++)

                 {
                     wxString buf;
                 {
                     wxString buf;

-                    buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+                buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str());

                     menu->Append(m_idBase+i, buf);
                 }
                     menu->Append(m_idBase+i, buf);
                 }

-            }

             node = node->GetNext();
         }
     }
             node = node->GetNext();
         }
     }


@@ -2336,7 +2302,7 @@ void wxFileHistory::AddFilesToMenu()
 
 void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 {
 
 void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 {

-    if (m_fileHistoryN > 0)
+    if (m_fileHistory.GetCount() > 0)

     {
         if (menu->GetMenuItemCount())
         {
     {
         if (menu->GetMenuItemCount())
         {


@@ -2344,16 +2310,13 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
         }
 
         size_t i;
         }
 
         size_t i;

-        for (i = 0; i < m_fileHistoryN; i++)
-        {
-            if (m_fileHistory[i])
+        for (i = 0; i < m_fileHistory.GetCount(); i++)

             {
                 wxString buf;
             {
                 wxString buf;

-                buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+            buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i].c_str());

                 menu->Append(m_idBase+i, buf);
             }
         }
                 menu->Append(m_idBase+i, buf);
             }
         }

-    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------