X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d43803715268f5396741b3f0eb4b94d1408c9f9d..974c115dff4da4a370a3569a3576cacb00eef7bb:/src/msw/filedlg.cpp diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index b788f8a7cf..cf0bb81e98 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -65,7 +65,7 @@ // ---------------------------------------------------------------------------- // standard dialog size for the old Windows systems where the dialog wasn't -// resizeable +// resizable static wxRect gs_rectDialog(0, 0, 428, 266); // ============================================================================ @@ -86,12 +86,22 @@ wxFileDialogHookFunction(HWND hDlg, { switch ( iMsg ) { +#ifndef __WXWINCE__ + case WM_INITDIALOG: + { + OPENFILENAME* ofn = reinterpret_cast(lParam); + reinterpret_cast(ofn->lCustData) + ->MSWOnInitDialogHook((WXHWND)hDlg); + } + break; +#endif // __WXWINCE__ + case WM_NOTIFY: { - OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam); + OFNOTIFY *pNotifyCode = reinterpret_cast(lParam); if ( pNotifyCode->hdr.code == CDN_INITDONE ) { - wx_reinterpret_cast(wxFileDialog *, + reinterpret_cast( pNotifyCode->lpOFN->lCustData) ->MSWOnInitDone((WXHWND)hDlg); } @@ -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++ ) @@ -164,14 +174,6 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const files = m_fileNames; } -void wxFileDialog::SetPath(const wxString& path) -{ - wxString ext; - wxSplitPath(path, &m_dir, &m_fileName, &ext); - if ( !ext.empty() ) - m_fileName << _T('.') << ext; -} - void wxFileDialog::DoGetPosition(int *x, int *y) const { if ( x ) @@ -223,7 +225,7 @@ void wxFileDialog::DoCentre(int dir) void wxFileDialog::MSWOnInitDone(WXHWND hDlg) { - // note the the dialog is the parent window: hDlg is a child of it when + // note the dialog is the parent window: hDlg is a child of it when // OFN_EXPLORER is used HWND hFileDlg = ::GetParent((HWND)hDlg); @@ -341,7 +343,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 +362,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 +398,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 +434,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(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 +476,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 +513,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,8 +537,7 @@ int wxFileDialog::ShowModal() //=== Setting defaultFileName >>========================================= - wxStrncpy(fileNameBuffer, m_fileName, wxMAXPATH-1); - fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0'); + wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer)); of.lpstrFile = fileNameBuffer; // holds returned filename of.nMaxFile = wxMAXPATH; @@ -563,7 +605,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); @@ -573,8 +615,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; @@ -596,8 +638,7 @@ int wxFileDialog::ShowModal() extension = extension + wxStrlen( extension ) + 1; m_fileName = AppendExtension(fileNameBuffer, extension); - wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1)); - fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0'); + wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer)); } m_path = fileNameBuffer;