mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-10-11 08:53:16 +08:00
Richard
c87d669946
When wxGenericDirCtrl is created with a hidden initial directory, the initial ExpandPath() can only select the nearest visible ancestor. Preserve the saved default path when ShowHidden(true) makes that hidden directory visible, while keeping the selected visible path for normal cases. Add a Windows GUI regression test that creates a hidden directory and checks that ShowHidden(true) restores the requested leaf path. Fixes #10399. Closes #27033.
79 lines
2.3 KiB
C++
79 lines
2.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: tests/controls/dirctrltest.cpp
|
|
// Purpose: wxGenericDirCtrl unit test
|
|
// Author: wxWidgets development team
|
|
// Created: 2026-07-09
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "testprec.h"
|
|
|
|
#if (wxUSE_DIRDLG || wxUSE_FILEDLG) && wxUSE_TREECTRL && defined(__WINDOWS__)
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/app.h"
|
|
#endif // WX_PRECOMP
|
|
|
|
#include "wx/filefn.h"
|
|
#include "wx/filename.h"
|
|
#include "wx/generic/dirctrlg.h"
|
|
#include "wx/msw/wrapwin.h"
|
|
#include "wx/msw/winundef.h"
|
|
|
|
#include "testfile.h"
|
|
|
|
class DirCtrlHiddenDirTestCase
|
|
{
|
|
public:
|
|
DirCtrlHiddenDirTestCase()
|
|
: m_rootDir(wxFileName(wxGetCwd(), "dirctrltest").GetFullPath())
|
|
{
|
|
m_rootDir.RequireOk();
|
|
|
|
m_hidden = m_rootDir.GetName() + wxString(wxFILE_SEP_PATH) + "hidden";
|
|
REQUIRE( wxMkdir(m_hidden) );
|
|
|
|
m_leaf = m_hidden + wxString(wxFILE_SEP_PATH) + "leaf";
|
|
REQUIRE( wxMkdir(m_leaf) );
|
|
|
|
const DWORD attrs = ::GetFileAttributes(m_hidden.t_str());
|
|
REQUIRE( attrs != INVALID_FILE_ATTRIBUTES );
|
|
REQUIRE( ::SetFileAttributes(m_hidden.t_str(),
|
|
attrs | FILE_ATTRIBUTE_HIDDEN) != 0 );
|
|
}
|
|
|
|
~DirCtrlHiddenDirTestCase()
|
|
{
|
|
wxTheApp->GetTopWindow()->DestroyChildren();
|
|
|
|
const DWORD attrs = ::GetFileAttributes(m_hidden.t_str());
|
|
if ( attrs != INVALID_FILE_ATTRIBUTES )
|
|
{
|
|
::SetFileAttributes(m_hidden.t_str(),
|
|
attrs & ~FILE_ATTRIBUTE_HIDDEN);
|
|
}
|
|
}
|
|
|
|
protected:
|
|
TempDir m_rootDir;
|
|
wxString m_hidden;
|
|
wxString m_leaf;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(DirCtrlHiddenDirTestCase);
|
|
};
|
|
|
|
TEST_CASE_METHOD(DirCtrlHiddenDirTestCase, "wxGenericDirCtrl::ShowHidden",
|
|
"[dirctrl]")
|
|
{
|
|
wxGenericDirCtrl* const dirctrl = new wxGenericDirCtrl(
|
|
wxTheApp->GetTopWindow(), wxID_ANY, m_leaf, wxDefaultPosition,
|
|
wxDefaultSize, wxDIRCTRL_DIR_ONLY);
|
|
|
|
CHECK_FALSE( wxFileName(dirctrl->GetPath()).SameAs(wxFileName(m_leaf)) );
|
|
|
|
dirctrl->ShowHidden(true);
|
|
|
|
CHECK( wxFileName(dirctrl->GetPath()).SameAs(wxFileName(m_leaf)) );
|
|
}
|
|
|
|
#endif // (wxUSE_DIRDLG || wxUSE_FILEDLG) && wxUSE_TREECTRL && __WINDOWS__
|