submenu preparation in two methods encapsulated

[wxWidgets.git] / src / os2 / filedlg.cpp

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 605d1b2cc4405e641cb70b93ba1524b75ca887f2..cb87d850f145dd32920f67fcee72c5b1321a013d 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -332,6 +332,7 @@ int wxFileDialog::ShowModal()
     if (sDir.IsEmpty())
         sDir = "*.*";
     wxStrcpy(vFileDlg.szFullFile, sDir.c_str());
     if (sDir.IsEmpty())
         sDir = "*.*";
     wxStrcpy(vFileDlg.szFullFile, sDir.c_str());

+    sFilterBuffer = sDir;

 
     hWnd = ::WinFileDlg( HWND_DESKTOP
                         ,GetHwndOf(m_pParent)
 
     hWnd = ::WinFileDlg( HWND_DESKTOP
                         ,GetHwndOf(m_pParent)


@@ -367,8 +368,14 @@ int wxFileDialog::ShowModal()
             wxStrcpy(zFileNameBuffer, vFileDlg.szFullFile);
 
             int                     nIdx = wxStrlen(zFileNameBuffer) - 1;
             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');
 
             {
                 zFileNameBuffer[nIdx] = wxT('\0');