Initialize all fields of struct tm used by wxDateTime::Format().

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index ae89ed5c05eb056991ca228c97e798a7132e10d4..1fb4bc288c55c561bced290ccc77da5f72273031 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -156,8 +156,8 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
     paths.Empty();
 
     wxString dir(m_dir);
     paths.Empty();
 
     wxString dir(m_dir);

-    if ( m_dir.Last() != _T('\\') )
-        dir += _T('\\');
+    if ( m_dir.Last() != wxT('\\') )
+        dir += wxT('\\');

 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )
 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )


@@ -174,14 +174,6 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     files = m_fileNames;
 }
 
     files = m_fileNames;
 }
 

-void wxFileDialog::SetPath(const wxString& path)
-{
-    wxString ext;
-    wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext);
-    if ( !ext.empty() )
-        m_fileName << _T('.') << ext;
-}
-

 void wxFileDialog::DoGetPosition(int *x, int *y) const
 {
     if ( x )
 void wxFileDialog::DoGetPosition(int *x, int *y) const
 {
     if ( x )


@@ -351,7 +343,7 @@ static bool ShowCommFileDialog(OPENFILENAME *of, long style)
     {
         // this can happen if the default file name is invalid, try without it
         // now
     {
         // this can happen if the default file name is invalid, try without it
         // now

-        of->lpstrFile[0] = _T('\0');
+        of->lpstrFile[0] = wxT('\0');

         success = DoShowCommFileDialog(of, style, &errCode);
     }
 
         success = DoShowCommFileDialog(of, style, &errCode);
     }
 


@@ -459,12 +451,11 @@ int wxFileDialog::ShowModal()
         lpdt->x = 0;
         lpdt->y = 0;
 
         lpdt->x = 0;
         lpdt->y = 0;
 

-        wxSize extra_size = GetExtraControlSize();
-        // setting cx doesn't change the width of the dialog
-        lpdt->cx = extra_size.GetWidth();
-        // Dividing by 2 gives expected height on WinXP and Wine.
-        // I don't know why (MW).
-        lpdt->cy = extra_size.GetHeight() / 2;
+        // convert the size of the extra controls to the dialog units
+        const wxSize extraSize = GetExtraControlSize();
+        const LONG baseUnits = ::GetDialogBaseUnits();
+        lpdt->cx = ::MulDiv(extraSize.x, 4, LOWORD(baseUnits));
+        lpdt->cy = ::MulDiv(extraSize.y, 8, HIWORD(baseUnits));

 
         // after the DLGTEMPLATE there are 3 additional WORDs for dialog menu,
         // class and title, all three set to zeros.
 
         // after the DLGTEMPLATE there are 3 additional WORDs for dialog menu,
         // class and title, all three set to zeros.


@@ -485,17 +476,17 @@ int wxFileDialog::ShowModal()
         wxChar ch = m_dir[i];
         switch ( ch )
         {
         wxChar ch = m_dir[i];
         switch ( ch )
         {

-            case _T('/'):
+            case wxT('/'):

                 // convert to backslash
                 // convert to backslash

-                ch = _T('\\');
+                ch = wxT('\\');

 
                 // fall through
 
 
                 // fall through
 

-            case _T('\\'):
+            case wxT('\\'):

                 while ( i < len - 1 )
                 {
                     wxChar chNext = m_dir[i + 1];
                 while ( i < len - 1 )
                 {
                     wxChar chNext = m_dir[i + 1];

-                    if ( chNext != _T('\\') && chNext != _T('/') )
+                    if ( chNext != wxT('\\') && chNext != wxT('/') )

                         break;
 
                     // ignore the next one, unless it is at the start of a UNC path
                         break;
 
                     // ignore the next one, unless it is at the start of a UNC path


@@ -522,7 +513,7 @@ int wxFileDialog::ShowModal()
 
     size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
 
 
     size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
 

-    wxASSERT_MSG( items > 0 , _T("empty wildcard list") );
+    wxASSERT_MSG( items > 0 , wxT("empty wildcard list") );

 
     wxString filterBuffer;
 
 
     wxString filterBuffer;
 


@@ -614,7 +605,7 @@ int wxFileDialog::ShowModal()
             i += wxStrlen(&fileNameBuffer[i]) + 1;
         }
 #else
             i += wxStrlen(&fileNameBuffer[i]) + 1;
         }
 #else

-        wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n"));
+        wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n"));

         m_dir = toke.GetNextToken();
         m_fileName = toke.GetNextToken();
         m_fileNames.Add(m_fileName);
         m_dir = toke.GetNextToken();
         m_fileName = toke.GetNextToken();
         m_fileNames.Add(m_fileName);


@@ -624,8 +615,8 @@ int wxFileDialog::ShowModal()
 #endif // OFN_EXPLORER
 
         wxString dir(m_dir);
 #endif // OFN_EXPLORER
 
         wxString dir(m_dir);

-        if ( m_dir.Last() != _T('\\') )
-            dir += _T('\\');
+        if ( m_dir.Last() != wxT('\\') )
+            dir += wxT('\\');

 
         m_path = dir + m_fileName;
         m_filterIndex = (int)of.nFilterIndex - 1;
 
         m_path = dir + m_fileName;
         m_filterIndex = (int)of.nFilterIndex - 1;