fixing osx_carbon

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

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 4a968e951a5ac087a4921ddb20e95b13db59e56f..f4fc9da6f11269bc69734045a1ca7ed63b9fb494 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -18,10 +18,12 @@
 
 #if wxUSE_FILEDLG
 
 
 #if wxUSE_FILEDLG
 

+#include "wx/filedlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"

-    #include "wx/filedlg.h"
+    #include "wx/filename.h"

     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"


@@ -91,8 +93,8 @@ void wxFileDialog::GetPaths (
     size_t                          nCount = m_fileNames.GetCount();
 
     rasPaths.Empty();
     size_t                          nCount = m_fileNames.GetCount();
 
     rasPaths.Empty();

-    if (m_dir.Last() != _T('\\'))
-        sDir += _T('\\');
+    if (m_dir.Last() != wxT('\\'))
+        sDir += wxT('\\');

 
     for ( size_t n = 0; n < nCount; n++ )
     {
 
     for ( size_t n = 0; n < nCount; n++ )
     {


@@ -130,11 +132,6 @@ int wxFileDialog::ShowModal()
     else
         lFlags = FDS_OPEN_DIALOG;
 
     else
         lFlags = FDS_OPEN_DIALOG;
 

-#if WXWIN_COMPATIBILITY_2_4
-    if (m_windowStyle & wxHIDE_READONLY)
-        lFlags |= FDS_SAVEAS_DIALOG;
-#endif
-

     if (m_windowStyle & wxFD_SAVE)
         lFlags |= FDS_SAVEAS_DIALOG;
     if (m_windowStyle & wxFD_MULTIPLE)
     if (m_windowStyle & wxFD_SAVE)
         lFlags |= FDS_SAVEAS_DIALOG;
     if (m_windowStyle & wxFD_MULTIPLE)


@@ -156,21 +153,21 @@ int wxFileDialog::ShowModal()
 
         switch (ch)
         {
 
         switch (ch)
         {

-            case _T('/'):
+            case wxT('/'):

                 //
                 // Convert to backslash
                 //
                 //
                 // Convert to backslash
                 //

-                ch = _T('\\');
+                ch = wxT('\\');

 
                 //
                 // Fall through
                 //
 
                 //
                 // Fall through
                 //

-            case _T('\\'):
+            case wxT('\\'):

                 while (i < nLen - 1)
                 {
                     wxChar          chNext = m_dir[i + 1];
 
                 while (i < nLen - 1)
                 {
                     wxChar          chNext = m_dir[i + 1];
 

-                    if (chNext != _T('\\') && chNext != _T('/'))
+                    if (chNext != wxT('\\') && chNext != wxT('/'))

                         break;
 
                     //
                         break;
 
                     //


@@ -197,7 +194,7 @@ int wxFileDialog::ShowModal()
     else
         sTheFilter = m_wildCard;
 
     else
         sTheFilter = m_wildCard;
 

-    wxStrtok((wxChar*)sTheFilter.c_str(), wxT("|"), &pzFilterBuffer);
+    wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer);

     while(pzFilterBuffer != NULL)
     {
         if (nCount > 0 && !(nCount % 2))
     while(pzFilterBuffer != NULL)
     {
         if (nCount > 0 && !(nCount % 2))


@@ -252,11 +249,11 @@ int wxFileDialog::ShowModal()
             int                     nIdx = wxStrlen(zFileNameBuffer) - 1;
             wxString                sExt;
 
             int                     nIdx = wxStrlen(zFileNameBuffer) - 1;
             wxString                sExt;
 

-            wxSplitPath( zFileNameBuffer
-                        ,&m_path
-                        ,&m_fileName
-                        ,&sExt
-                       );
+            wxFileName::SplitPath( zFileNameBuffer
+                                    ,&m_path
+                                    ,&m_fileName
+                                    ,&sExt
+                                  );

             if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty())
             {
                 zFileNameBuffer[nIdx] = wxT('\0');
             if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty())
             {
                 zFileNameBuffer[nIdx] = wxT('\0');