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

File dialog fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-08-21 04:12:31 +00:00
parent 15c3723c60
commit 25fc812c74
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/os2/filedlg.h
View File

@@ -18,9 +18,6 @@
* File selector * File selector
*/ */
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
class WXDLLEXPORT wxFileDialog: public wxDialog class WXDLLEXPORT wxFileDialog: public wxDialog
{ {
DECLARE_DYNAMIC_CLASS(wxFileDialog) DECLARE_DYNAMIC_CLASS(wxFileDialog)
@@ -47,7 +44,7 @@ public:
void GetPaths(wxArrayString& rasPath) const; void GetPaths(wxArrayString& rasPath) const;
inline wxString GetDirectory(void) const { return m_sDir; } inline wxString GetDirectory(void) const { return m_sDir; }
inline wxString GetFilename(void) const { return m_sFileName; } 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 wxString GetWildcard(void) const { return m_sWildCard; }
inline long GetStyle(void) const { return m_lDialogStyle; } inline long GetStyle(void) const { return m_lDialogStyle; }
inline int GetFilterIndex() const { return m_nFilterIndex ; } inline int GetFilterIndex() const { return m_nFilterIndex ; }

9
src/os2/filedlg.cpp
View File

@@ -332,6 +332,7 @@ int wxFileDialog::ShowModal()
if (sDir.IsEmpty()) if (sDir.IsEmpty())
sDir = "*.*"; sDir = "*.*";
wxStrcpy(vFileDlg.szFullFile, sDir.c_str()); wxStrcpy(vFileDlg.szFullFile, sDir.c_str());
sFilterBuffer = sDir;
hWnd = ::WinFileDlg( HWND_DESKTOP hWnd = ::WinFileDlg( HWND_DESKTOP
,GetHwndOf(m_pParent) ,GetHwndOf(m_pParent)
@@ -367,8 +368,14 @@ int wxFileDialog::ShowModal()
wxStrcpy(zFileNameBuffer, vFileDlg.szFullFile); wxStrcpy(zFileNameBuffer, vFileDlg.szFullFile);
int nIdx = wxStrlen(zFileNameBuffer) - 1; 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'); zFileNameBuffer[nIdx] = wxT('\0');