X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e408bf5257ead0754de5ef37a39867c7536dbe03..69cecdb1c42a0dc9736a8f7ab600330641598909:/src/msw/filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 546b6c7ab0..8aae8b46b1 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -86,6 +86,16 @@ wxFileDialogHookFunction(HWND      hDlg,
 {
     switch ( iMsg )
     {
+#ifndef __WXWINCE__
+        case WM_INITDIALOG:
+            {
+                OPENFILENAME* ofn = reinterpret_cast<OPENFILENAME *>(lParam);
+                reinterpret_cast<wxFileDialog *>(ofn->lCustData)
+                    ->MSWOnInitDialogHook((WXHWND)hDlg);
+            }
+            break;
+#endif // __WXWINCE__
+
         case WM_NOTIFY:
             {
                 OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
@@ -146,8 +156,8 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
     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++ )
@@ -167,9 +177,9 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;
-    wxSplitPath(path, &m_dir, &m_fileName, &ext);
+    wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext);
     if ( !ext.empty() )
-        m_fileName << _T('.') << ext;
+        m_fileName << wxT('.') << ext;
 }
 
 void wxFileDialog::DoGetPosition(int *x, int *y) const
@@ -341,7 +351,7 @@ static bool ShowCommFileDialog(OPENFILENAME *of, long style)
     {
         // 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);
     }
 
@@ -360,6 +370,17 @@ static bool ShowCommFileDialog(OPENFILENAME *of, long style)
     return true;
 }
 
+#ifndef __WXWINCE__
+void wxFileDialog::MSWOnInitDialogHook(WXHWND hwnd)
+{
+   SetHWND(hwnd);
+
+   CreateExtraControl();
+
+   SetHWND(NULL);
+}
+#endif // __WXWINCE__
+
 int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;
@@ -385,7 +406,7 @@ int wxFileDialog::ShowModal()
         in the upper left of the frame, it does not center
         automatically.
     */
-    if (m_bMovedWindow) // we need these flags.
+    if (m_bMovedWindow || HasExtraControlCreator()) // we need these flags.
     {
         msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
 #ifndef __WXWINCE__
@@ -421,6 +442,36 @@ int wxFileDialog::ShowModal()
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 
+#ifndef __WXWINCE__
+    GlobalPtr hgbl;
+    if ( HasExtraControlCreator() )
+    {
+        msw_flags |= OFN_ENABLETEMPLATEHANDLE;
+
+        hgbl.Init(256, GMEM_ZEROINIT);
+        GlobalPtrLock hgblLock(hgbl);
+        LPDLGTEMPLATE lpdt = static_cast<LPDLGTEMPLATE>(hgblLock.Get());
+
+        // Define a dialog box.
+
+        lpdt->style = DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS;
+        lpdt->cdit = 0;         // Number of controls
+        lpdt->x = 0;
+        lpdt->y = 0;
+
+        // 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.
+
+        of.hInstance = (HINSTANCE)lpdt;
+    }
+#endif // __WXWINCE__
+
     // Convert forward slashes to backslashes (file selector doesn't like
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither
@@ -433,17 +484,17 @@ int wxFileDialog::ShowModal()
         wxChar ch = m_dir[i];
         switch ( ch )
         {
-            case _T('/'):
+            case wxT('/'):
                 // convert to backslash
-                ch = _T('\\');
+                ch = wxT('\\');
 
                 // fall through
 
-            case _T('\\'):
+            case wxT('\\'):
                 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
@@ -470,7 +521,7 @@ int wxFileDialog::ShowModal()
 
     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;
 
@@ -494,7 +545,7 @@ int wxFileDialog::ShowModal()
 
     //=== Setting defaultFileName >>=========================================
 
-    wxStrlcpy(fileNameBuffer, m_fileName, WXSIZEOF(fileNameBuffer));
+    wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;
@@ -562,7 +613,7 @@ int wxFileDialog::ShowModal()
             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);
@@ -572,8 +623,8 @@ int wxFileDialog::ShowModal()
 #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;