drawing optimization fix

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index bbfdf9ab3fddbfc8efc8f041699b002906a84622..4f7427ebfec657c541cc160f48099bc22dcec95e 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -358,7 +358,6 @@ bool wxDocument::OnSaveModified(void)
 {
   if (IsModified())
   {
 {
   if (IsModified())
   {

-    char buf[400];

     wxString title;
     GetPrintableName(title);
 
     wxString title;
     GetPrintableName(title);
 


@@ -368,9 +367,12 @@ bool wxDocument::OnSaveModified(void)
     else
       msgTitle = wxString(_("Warning"));
 
     else
       msgTitle = wxString(_("Warning"));
 

-    sprintf(buf, _("Do you want to save changes to document %s?"), (const char *)title);
-    int res = wxMessageBox(buf, msgTitle, wxYES_NO|wxCANCEL|wxICON_QUESTION,
-      GetDocumentWindow());
+    wxString prompt;
+    prompt.Printf(_("Do you want to save changes to document %s?"),
+                  (const char *)title);
+    int res = wxMessageBox(prompt, msgTitle,
+                           wxYES_NO|wxCANCEL|wxICON_QUESTION,
+                           GetDocumentWindow());

     if (res == wxNO)
     {
       Modify(FALSE);
     if (res == wxNO)
     {
       Modify(FALSE);


@@ -1003,10 +1005,9 @@ wxDocument *wxDocManager::GetCurrentDocument(void) const
 // Make a default document name
 bool wxDocManager::MakeDefaultName(wxString& name)
 {
 // Make a default document name
 bool wxDocManager::MakeDefaultName(wxString& name)
 {

-  char buf[256];
-  sprintf(buf, _("unnamed%d"), m_defaultDocumentNameCounter);
-  m_defaultDocumentNameCounter ++;
-  name = buf;
+  name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
+  m_defaultDocumentNameCounter++;
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -1130,12 +1131,18 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 // How to implement in wxWindows? Must extend the file selector
 // dialog or implement own; OR match the extension to the
 // template extension.
 // How to implement in wxWindows? Must extend the file selector
 // dialog or implement own; OR match the extension to the
 // template extension.

+
+#ifdef __WXMSW__

 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     int noTemplates, wxString& path, long WXUNUSED(flags), bool WXUNUSED(save))
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     int noTemplates, wxString& path, long WXUNUSED(flags), bool WXUNUSED(save))

+#else
+wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **WXUNUSED(templates),
+    int WXUNUSED(noTemplates), wxString& path, long WXUNUSED(flags), bool WXUNUSED(save))
+#endif    

 {
   // We can only have multiple filters in Windows
 #ifdef __WXMSW__
 {
   // We can only have multiple filters in Windows
 #ifdef __WXMSW__

-  char *descrBuf = new char[1000];
+  char *descrBuf = new char[1000];  // FIXME static buffer

   descrBuf[0] = 0;
   int i;
   for (i = 0; i < noTemplates; i++)
   descrBuf[0] = 0;
   int i;
   for (i = 0; i < noTemplates; i++)


@@ -1155,6 +1162,9 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
   if (len > 0)
     // Omit final "|"
     descrBuf[len-1] = 0;
   if (len > 0)
     // Omit final "|"
     descrBuf[len-1] = 0;

+#else
+  char* descrBuf = copystring("*.*");
+#endif

 
   char *pathTmp = wxFileSelector(_("Select a file"), "", "", "", descrBuf, 0, wxTheApp->GetTopWindow());
   delete[] descrBuf;
 
   char *pathTmp = wxFileSelector(_("Select a file"), "", "", "", descrBuf, 0, wxTheApp->GetTopWindow());
   delete[] descrBuf;


@@ -1177,7 +1187,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     path = "";
     return (wxDocTemplate *) NULL;
   }
     path = "";
     return (wxDocTemplate *) NULL;
   }

-#else
+#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.
   // 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.


@@ -1779,8 +1789,8 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
   for (i = 0; i < m_fileHistoryN; i++)
     if (m_fileHistory[i])
     {
   for (i = 0; i < m_fileHistoryN; i++)
     if (m_fileHistory[i])
     {

-      char buf[400];
-      sprintf(buf, "&%d %s", i+1, m_fileHistory[i]);
+      wxString buf;
+      buf.Printf("&%d %s", i+1, m_fileHistory[i]);

       wxNode* node = m_fileMenus.First();
       while (node)
       {
       wxNode* node = m_fileMenus.First();
       while (node)
       {


@@ -1813,14 +1823,14 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
 void wxFileHistory::Load(wxConfigBase& config)
 {
   m_fileHistoryN = 0;
 void wxFileHistory::Load(wxConfigBase& config)
 {
   m_fileHistoryN = 0;

-  char buf[400];
-  sprintf(buf, "file%d", m_fileHistoryN+1);
-  wxString historyFile("");
+  wxString buf;
+  buf.Printf("file%d", m_fileHistoryN+1);
+  wxString historyFile;

   while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != ""))
   {
     m_fileHistory[m_fileHistoryN] = copystring((const char*) historyFile);
     m_fileHistoryN ++;
   while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != ""))
   {
     m_fileHistory[m_fileHistoryN] = copystring((const char*) historyFile);
     m_fileHistoryN ++;

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

     historyFile = "";
   }
   AddFilesToMenu();
     historyFile = "";
   }
   AddFilesToMenu();