File dialog fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,9 +18,6 @@
|
||||
* File selector
|
||||
*/
|
||||
|
||||
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
|
||||
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
|
||||
|
||||
class WXDLLEXPORT wxFileDialog: public wxDialog
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxFileDialog)
|
||||
@@ -47,7 +44,7 @@ public:
|
||||
void GetPaths(wxArrayString& rasPath) const;
|
||||
inline wxString GetDirectory(void) const { return m_sDir; }
|
||||
inline wxString GetFilename(void) const { return m_sFileName; }
|
||||
inline void GetFilenames(wxArrayString& rasFilenames) { rasFilenames.Empty(); rasFilenames.Add( m_sFileName); }
|
||||
inline void GetFilenames(wxArrayString& rasFilenames) { rasFilenames = m_asFileNames; }
|
||||
inline wxString GetWildcard(void) const { return m_sWildCard; }
|
||||
inline long GetStyle(void) const { return m_lDialogStyle; }
|
||||
inline int GetFilterIndex() const { return m_nFilterIndex ; }
|
||||
|
@@ -332,6 +332,7 @@ int wxFileDialog::ShowModal()
|
||||
if (sDir.IsEmpty())
|
||||
sDir = "*.*";
|
||||
wxStrcpy(vFileDlg.szFullFile, sDir.c_str());
|
||||
sFilterBuffer = sDir;
|
||||
|
||||
hWnd = ::WinFileDlg( HWND_DESKTOP
|
||||
,GetHwndOf(m_pParent)
|
||||
@@ -367,8 +368,14 @@ int wxFileDialog::ShowModal()
|
||||
wxStrcpy(zFileNameBuffer, vFileDlg.szFullFile);
|
||||
|
||||
int nIdx = wxStrlen(zFileNameBuffer) - 1;
|
||||
wxString sExt;
|
||||
|
||||
if (zFileNameBuffer[nIdx] == wxT('.') )
|
||||
wxSplitPath( zFileNameBuffer
|
||||
,&m_sPath
|
||||
,&m_sFileName
|
||||
,&sExt
|
||||
);
|
||||
if (zFileNameBuffer[nIdx] == wxT('.') || sExt.IsEmpty())
|
||||
{
|
||||
zFileNameBuffer[nIdx] = wxT('\0');
|
||||
|
||||
|
Reference in New Issue
Block a user