fixed the vsprintf() problem once and for all

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 05c91f918cddab38ead2b96355bc616b54bf08db..f5cc104122b75b58ebc8c4f59f9309cd746572bd 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -271,7 +271,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 +329,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];