SF.net SVN: mahogany: [7219] trunk/M/src

[email protected]
Newsgroups gmane.mail.mahogany.cvs
Message-ID <[email protected]>
Revision: 7219
          http://svn.sourceforge.net/mahogany/?rev=7219&view=rev
Author:   vadz
Date:     2007-04-02 09:23:06 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
use wxFD_XXX constants instead of deprecated wxXXX ones; added convenient wrappers wxPSave/LoadExistingFileSelector

Modified Paths:
--------------
    trunk/M/src/adb/ExportVCard.cpp
    trunk/M/src/classes/ComposeTemplate.cpp
    trunk/M/src/classes/MessageView.cpp

Modified: trunk/M/src/adb/ExportVCard.cpp
===================================================================
--- trunk/M/src/adb/ExportVCard.cpp	2007-04-02 16:22:36 UTC (rev 7218)
+++ trunk/M/src/adb/ExportVCard.cpp	2007-04-02 16:23:06 UTC (rev 7219)
@@ -27,7 +27,6 @@
    #include "guidef.h"
 
    #include <wx/dirdlg.h>
-   #include <wx/filedlg.h>
 #endif // USE_PCH
 
 #include "adb/AdbEntry.h"
@@ -35,6 +34,7 @@
 
 #include <wx/dir.h>
 #include <wx/datetime.h>
+#include <wx/persctrl.h>
 #include <wx/vcard.h>
 
 // ----------------------------------------------------------------------------
@@ -315,10 +315,14 @@
    wxString filename = dest;
    if ( !filename )
    {
-      filename = wxFileSelector(_("Choose the name for vCard file"),
-                                NULL, NULL, _T(".vcf"),
-                                _("vCard files (*.vcf)|*.vcf|All files (*.*)|*.*"),
-                                wxSAVE);
+      filename = wxPSaveFileSelector
+                 (
+                     NULL, // no parent
+                     "vcard",
+                     _("Choose the name for vCard file"),
+                     NULL, NULL, _T(".vcf"),
+                     _("vCard files (*.vcf)|*.vcf|All files (*.*)|*.*")
+                 );
       if ( !filename )
       {
          // cancelled

Modified: trunk/M/src/classes/ComposeTemplate.cpp
===================================================================
--- trunk/M/src/classes/ComposeTemplate.cpp	2007-04-02 16:22:36 UTC (rev 7218)
+++ trunk/M/src/classes/ComposeTemplate.cpp	2007-04-02 16:23:06 UTC (rev 7219)
@@ -1471,11 +1471,13 @@
                                      M_DLG_YES_DEFAULT,
                                      M_MSGBOX_ASK_FOR_SIG) )
             {
-               strSignFile = wxPFileSelector(_T("sig"),
-                                             _("Choose signature file"),
-                                             NULL, _T(".signature"), NULL,
-                                             wxGetTranslation(wxALL_FILES),
-                                             0, m_cv.GetFrame());
+               strSignFile = wxPLoadExistingFileSelector
+                             (
+                                 m_cv.GetFrame(),
+                                 "sig",
+                                 _("Choose signature file"),
+                                 NULL, _T(".signature"), NULL
+                             );
             }
             else
             {

Modified: trunk/M/src/classes/MessageView.cpp
===================================================================
--- trunk/M/src/classes/MessageView.cpp	2007-04-02 16:22:36 UTC (rev 7218)
+++ trunk/M/src/classes/MessageView.cpp	2007-04-02 16:23:06 UTC (rev 7219)
@@ -3229,14 +3229,13 @@
       wxString path, name, ext;
       wxSplitPath(filename, &path, &name, &ext);
 
-      filename = wxPFileSelector(_T("MimeSave"),_("Save attachment as:"),
-                                 NULL, // no default path
-                                 name, ext,
-                                 NULL,
-                                 wxFILEDLG_USE_FILENAME |
-                                 wxSAVE |
-                                 wxOVERWRITE_PROMPT,
-                                 GetParentFrame());
+      filename = wxPSaveFileSelector
+                 (
+                     GetParentFrame(),
+                     "MimeSave",
+                     _("Save attachment as:"),
+                     NULL /* no default path */, name, ext
+                 );
    }
    else
       filename = ifilename;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.