Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 800784 ] Fixes ::wxDirSelector style problem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-11 12:44:24 +00:00
parent 3e1d2fe00b
commit 037767538e
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/dirdlg.cpp
View File

@@ -158,10 +158,6 @@ int wxDirDialog::ShowModal()
bi.ulFlags |= BIF_EDITBOX; bi.ulFlags |= BIF_EDITBOX;
} }
// normally the commented out part should work -- but in practice
// BIF_NONEWFOLDERBUTTON doesn't have any effect (Win2k, comctl 5.81) so I
// have to disable it [for now]
#if 0
// to have the "New Folder" button we must use the "new" dialog style which // to have the "New Folder" button we must use the "new" dialog style which
// is also the only way to have a resizable dialog // is also the only way to have a resizable dialog
// //
@@ -169,20 +165,23 @@ int wxDirDialog::ShowModal()
const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON); const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON);
if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) ) if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) )
{ {
bi.ulFlags |= BIF_NEWDIALOGSTYLE; if (needNewDir)
{
// we'll get the "New Folder" button by default now, don't show it if bi.ulFlags |= BIF_NEWDIALOGSTYLE;
// not needed }
if ( !needNewDir ) else
bi.ulFlags |= BIF_NONEWFOLDERBUTTON; {
// Versions < 600 doesn't support BIF_NONEWFOLDERBUTTON
// The only way to get rid of the Make New Folder button is use
// the old dialog style which doesn't have the button thus we
// simply don't set the New Dialog Style for such comctl versions.
if (verComCtl32 >= 600)
{
bi.ulFlags |= BIF_NEWDIALOGSTYLE;
bi.ulFlags |= BIF_NONEWFOLDERBUTTON;
}
}
} }
#else
if ( HasFlag(wxDD_NEW_DIR_BUTTON) && verComCtl32 >= 500 )
{
// use the new style to make the "New Folder" button appear
bi.ulFlags |= BIF_NEWDIALOGSTYLE;
}
#endif
// do show the dialog // do show the dialog
LPITEMIDLIST pidl = SHBrowseForFolder(&bi); LPITEMIDLIST pidl = SHBrowseForFolder(&bi);