1. registry files corresponding to the recent registry.h changes

[wxWidgets.git] / src / msw / filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 05c91f918cddab38ead2b96355bc616b54bf08db..30d397bf4fc07320ceef4999236879c9eddc3732 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -24,13 +24,15 @@
 #include <stdio.h>
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include <stdio.h>
 #include "wx/defs.h"
 #include "wx/utils.h"

+#include "wx/msgdlg.h"

 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"

+#include "wx/intl.h"

 #endif
 
 #include <windows.h>
 
 #endif
 
 #include <windows.h>
 

-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__SALFORDC__)

 #include <commdlg.h>
 #endif
 
 #include <commdlg.h>
 #endif
 


@@ -82,12 +84,36 @@ char *wxFileSelector(const char *title,
         defaultFilenameString = "";
 
     wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
         defaultFilenameString = "";
 
     wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));

-
+    if(defaultExtension)
+      {
+       unsigned int ii;
+       int filterFind,filterIndex=0;
+       filterFind=1;
+       for(ii=0;ii<filter2.Length();ii++)
+         {
+           if(filter2[ii] == '|')
+             {
+               unsigned int is=ii++;
+               filterIndex++;
+               for(;ii<filter2.Length();ii++)
+                 if(filter2[ii] == '|')
+                   break;
+               if(ii-is-1 > 0 && is+1 < filter2.Length())
+                 if(filter2.Mid(is+1,ii-is-1) == defaultExtension)
+                   {
+                     filterFind=filterIndex;
+                     break;
+                   }
+             }
+         }
+       fileDialog.SetFilterIndex(filterFind);
+      }                 
+    

     if ( fileDialog.ShowModal() == wxID_OK )
     if ( fileDialog.ShowModal() == wxID_OK )

-    {
+      {

         strcpy(wxBuffer, (const char *)fileDialog.GetPath());
         return wxBuffer;
         strcpy(wxBuffer, (const char *)fileDialog.GetPath());
         return wxBuffer;

-    }
+      }

     else
         return NULL;
 }
     else
         return NULL;
 }


@@ -271,7 +297,8 @@ int wxFileDialog::ShowModal(void)
                 extension = extension + strlen( extension ) +1;
             }
 
                 extension = extension + strlen( extension ) +1;
             }
 

-            if (  (extension = strrchr( extension, '.' ))   // != "blabla" 
+            extension = strrchr( extension, '.' );
+            if (  extension                                 // != "blabla" 

                   && !strrchr( extension, '*' )             // != "blabla.*"
                   && !strrchr( extension, '?' )             // != "blabla.?"
                   && extension[1]                           // != "blabla."
                   && !strrchr( extension, '*' )             // != "blabla.*"
                   && !strrchr( extension, '?' )             // != "blabla.?"
                   && extension[1]                           // != "blabla."


@@ -328,10 +355,10 @@ wxDefaultFileSelector(bool load, const char *what, const char *extension, const
   char prompt[50];
   wxString str;
   if (load)
   char prompt[50];
   wxString str;
   if (load)

-    str = (const char*) wxTString("Load %s file");
+    str = "Load %s file";

   else
   else

-    str = (const char*) wxTString("Save %s file");
-  sprintf(prompt, str, what);
+    str = "Save %s file";
+  sprintf(prompt, wxGetTranslation(str), what);

 
   if (*ext == '.') ext++;
   char wild[60];
 
   if (*ext == '.') ext++;
   char wild[60];