wxRichTextCtrl::ApplyStyle now applies a paragraph style at the cursor

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 76c8f73ecccb68535dcc7e556ae8635c057525a3..1fb4bc288c55c561bced290ccc77da5f72273031 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -29,6 +29,8 @@
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/msw/missing.h"

     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/filefn.h"
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/filefn.h"


@@ -38,16 +40,12 @@
     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 

-#include "wx/msw/wrapcdlg.h"
-

 #include <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 

-#include "wx/msw/missing.h"
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -66,7 +64,8 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-// standard dialog size
+// standard dialog size for the old Windows systems where the dialog wasn't
+// resizeable

 static wxRect gs_rectDialog(0, 0, 428, 266);
 
 // ============================================================================
 static wxRect gs_rectDialog(0, 0, 428, 266);
 
 // ============================================================================


@@ -87,21 +86,24 @@ wxFileDialogHookFunction(HWND      hDlg,
 {
     switch ( iMsg )
     {
 {
     switch ( iMsg )
     {

+#ifndef __WXWINCE__
+        case WM_INITDIALOG:
+            {
+                OPENFILENAME* ofn = reinterpret_cast<OPENFILENAME *>(lParam);
+                reinterpret_cast<wxFileDialog *>(ofn->lCustData)
+                    ->MSWOnInitDialogHook((WXHWND)hDlg);
+            }
+            break;
+#endif // __WXWINCE__
+

         case WM_NOTIFY:
             {
         case WM_NOTIFY:
             {

-                OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam);
+                OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);

                 if ( pNotifyCode->hdr.code == CDN_INITDONE )
                 {
                 if ( pNotifyCode->hdr.code == CDN_INITDONE )
                 {

-                    // note that we need to move the parent window: hDlg is a
-                    // child of it when OFN_EXPLORER is used
-                    ::SetWindowPos
-                      (
-                        ::GetParent(hDlg),
-                        HWND_TOP,
-                        gs_rectDialog.x, gs_rectDialog.y,
-                        0, 0,
-                        SWP_NOZORDER | SWP_NOSIZE
-                      );
+                    reinterpret_cast<wxFileDialog *>(
+                                        pNotifyCode->lpOFN->lCustData)
+                        ->MSWOnInitDone((WXHWND)hDlg);

                  }
             }
             break;
                  }
             }
             break;


@@ -140,21 +142,22 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     // NB: all style checks are done by wxFileDialogBase::Create
 
     m_bMovedWindow = false;
     // NB: all style checks are done by wxFileDialogBase::Create
 
     m_bMovedWindow = false;

+    m_centreDir = 0;

 
     // Must set to zero, otherwise the wx routines won't size the window
     // the second time you call the file dialog, because it thinks it is
     // already at the requested size.. (when centering)
     gs_rectDialog.x =
     gs_rectDialog.y = 0;
 
     // Must set to zero, otherwise the wx routines won't size the window
     // the second time you call the file dialog, because it thinks it is
     // already at the requested size.. (when centering)
     gs_rectDialog.x =
     gs_rectDialog.y = 0;

-

 }
 }

+

 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
     paths.Empty();
 
     wxString dir(m_dir);
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
     paths.Empty();
 
     wxString dir(m_dir);

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

 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )
 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )


@@ -171,14 +174,6 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     files = m_fileNames;
 }
 
     files = m_fileNames;
 }
 

-void wxFileDialog::SetPath(const wxString& path)
-{
-    wxString ext;
-    wxSplitPath(path, &m_dir, &m_fileName, &ext);
-    if ( !ext.empty() )
-        m_fileName << _T('.') << ext;
-}
-

 void wxFileDialog::DoGetPosition(int *x, int *y) const
 {
     if ( x )
 void wxFileDialog::DoGetPosition(int *x, int *y) const
 {
     if ( x )


@@ -187,7 +182,6 @@ void wxFileDialog::DoGetPosition(int *x, int *y) const
         *y = gs_rectDialog.y;
 }
 
         *y = gs_rectDialog.y;
 }
 

-

 void wxFileDialog::DoGetSize(int *width, int *height) const
 {
     if ( width )
 void wxFileDialog::DoGetSize(int *width, int *height) const
 {
     if ( width )


@@ -198,19 +192,70 @@ void wxFileDialog::DoGetSize(int *width, int *height) const
 
 void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
 {
 
 void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
 {

-    m_bMovedWindow = true;
-

     gs_rectDialog.x = x;
     gs_rectDialog.y = y;
 
     gs_rectDialog.x = x;
     gs_rectDialog.y = y;
 

-    // size of the dialog can't be changed because the controls are not laid
-    // out correctly then
+    // our HWND is only set when we're called from MSWOnInitDone(), test if
+    // this is the case
+    HWND hwnd = GetHwnd();
+    if ( hwnd )
+    {
+        // size of the dialog can't be changed because the controls are not
+        // laid out correctly then
+       ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+    }
+    else // just remember that we were requested to move the window
+    {
+        m_bMovedWindow = true;
+
+        // if Centre() had been called before, it shouldn't be taken into
+        // account now
+        m_centreDir = 0;
+    }
+}
+
+void wxFileDialog::DoCentre(int dir)
+{
+    m_centreDir = dir;
+    m_bMovedWindow = true;
+
+    // it's unnecessary to do anything else at this stage as we'll redo it in
+    // MSWOnInitDone() anyhow

 }
 
 }
 

-// helper used below in ShowModal(): style is used to determine whether to show
-// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one;
-// returns true on success or false on failure in which case err is filled with
-// the CDERR_XXX constant
+void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
+{
+    // note the the dialog is the parent window: hDlg is a child of it when
+    // OFN_EXPLORER is used
+    HWND hFileDlg = ::GetParent((HWND)hDlg);
+
+    // set HWND so that our DoMoveWindow() works correctly
+    SetHWND((WXHWND)hFileDlg);
+
+    if ( m_centreDir )
+    {
+        // now we have the real dialog size, remember it
+        RECT rect;
+        GetWindowRect(hFileDlg, &rect);
+        gs_rectDialog = wxRectFromRECT(rect);
+
+        // and position the window correctly: notice that we must use the base
+        // class version as our own doesn't do anything except setting flags
+        wxFileDialogBase::DoCentre(m_centreDir);
+    }
+    else // need to just move it to the correct place
+    {
+        SetPosition(gs_rectDialog.GetPosition());
+    }
+
+    // we shouldn't destroy this HWND
+    SetHWND(NULL);
+}
+
+// helper used below in ShowCommFileDialog(): style is used to determine
+// whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or
+// "Open file" one; returns true on success or false on failure in which case
+// err is filled with the CDERR_XXX constant

 static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
 {
     if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
 static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
 {
     if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )


@@ -265,6 +310,69 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
     static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
 #endif // __WXWINCE__ || __WIN64__/!...
 
     static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
 #endif // __WXWINCE__ || __WIN64__/!...
 

+static bool ShowCommFileDialog(OPENFILENAME *of, long style)
+{
+    DWORD errCode;
+    bool success = DoShowCommFileDialog(of, style, &errCode);
+
+#ifdef wxTRY_SMALLER_OPENFILENAME
+    // the system might be too old to support the new version file dialog
+    // boxes, try with the old size
+    if ( !success && errCode == CDERR_STRUCTSIZE &&
+            of->lStructSize != wxOPENFILENAME_V4_SIZE )
+    {
+        of->lStructSize = wxOPENFILENAME_V4_SIZE;
+
+        success = DoShowCommFileDialog(of, style, &errCode);
+
+        if ( success || !errCode )
+        {
+            // use this struct size for subsequent dialogs
+            gs_ofStructSize = of->lStructSize;
+        }
+    }
+#endif // wxTRY_SMALLER_OPENFILENAME
+
+    if ( !success &&
+            // FNERR_INVALIDFILENAME is not defined under CE (besides we don't
+            // use CommDlgExtendedError() there anyhow)
+#ifndef __WXWINCE__
+            errCode == FNERR_INVALIDFILENAME &&
+#endif // !__WXWINCE__
+                of->lpstrFile[0] )
+    {
+        // this can happen if the default file name is invalid, try without it
+        // now
+        of->lpstrFile[0] = wxT('\0');
+        success = DoShowCommFileDialog(of, style, &errCode);
+    }
+
+    if ( !success )
+    {
+        // common dialog failed - why?
+        if ( errCode != 0 )
+        {
+            wxLogError(_("File dialog failed with error code %0lx."), errCode);
+        }
+        //else: it was just cancelled
+
+        return false;
+    }
+
+    return true;
+}
+
+#ifndef __WXWINCE__
+void wxFileDialog::MSWOnInitDialogHook(WXHWND hwnd)
+{
+   SetHWND(hwnd);
+
+   CreateExtraControl();
+
+   SetHWND(NULL);
+}
+#endif // __WXWINCE__
+

 int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;
 int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;


@@ -278,15 +386,9 @@ int wxFileDialog::ShowModal()
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 

-#if WXWIN_COMPATIBILITY_2_4
-    long msw_flags = 0;
-    if ( (m_windowStyle & wxHIDE_READONLY) || (m_windowStyle & wxFD_SAVE) )
-        msw_flags |= OFN_HIDEREADONLY;
-#else

     long msw_flags = OFN_HIDEREADONLY;
     long msw_flags = OFN_HIDEREADONLY;

-#endif

 
 

-    if ( m_windowStyle & wxFD_FILE_MUST_EXIST )
+    if ( HasFdFlag(wxFD_FILE_MUST_EXIST) )

         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
     /*
         If the window has been moved the programmer is probably
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
     /*
         If the window has been moved the programmer is probably


@@ -296,7 +398,7 @@ int wxFileDialog::ShowModal()
         in the upper left of the frame, it does not center
         automatically.
     */
         in the upper left of the frame, it does not center
         automatically.
     */

-    if (m_bMovedWindow) // we need these flags.
+    if (m_bMovedWindow || HasExtraControlCreator()) // we need these flags.

     {
         msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
 #ifndef __WXWINCE__
     {
         msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
 #ifndef __WXWINCE__


@@ -304,7 +406,7 @@ int wxFileDialog::ShowModal()
 #endif
     }
 
 #endif
     }
 

-    if (m_windowStyle & wxFD_MULTIPLE )
+    if ( HasFdFlag(wxFD_MULTIPLE) )

     {
         // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
         msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
     {
         // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
         msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;


@@ -313,12 +415,12 @@ int wxFileDialog::ShowModal()
     // if wxFD_CHANGE_DIR flag is not given we shouldn't change the CWD which the
     // standard dialog does by default (notice that under NT it does it anyhow,
     // OFN_NOCHANGEDIR or not, see below)
     // if wxFD_CHANGE_DIR flag is not given we shouldn't change the CWD which the
     // standard dialog does by default (notice that under NT it does it anyhow,
     // OFN_NOCHANGEDIR or not, see below)

-    if ( !(m_windowStyle & wxFD_CHANGE_DIR) )
+    if ( !HasFdFlag(wxFD_CHANGE_DIR) )

     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
 
     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
 

-    if ( m_windowStyle & wxFD_OVERWRITE_PROMPT )
+    if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) )

     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }
     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }


@@ -328,10 +430,40 @@ int wxFileDialog::ShowModal()
 
     of.lStructSize       = gs_ofStructSize;
     of.hwndOwner         = hWnd;
 
     of.lStructSize       = gs_ofStructSize;
     of.hwndOwner         = hWnd;

-    of.lpstrTitle        = WXSTRINGCAST m_message;
+    of.lpstrTitle        = m_message.wx_str();

     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 

+#ifndef __WXWINCE__
+    GlobalPtr hgbl;
+    if ( HasExtraControlCreator() )
+    {
+        msw_flags |= OFN_ENABLETEMPLATEHANDLE;
+
+        hgbl.Init(256, GMEM_ZEROINIT);
+        GlobalPtrLock hgblLock(hgbl);
+        LPDLGTEMPLATE lpdt = static_cast<LPDLGTEMPLATE>(hgblLock.Get());
+
+        // Define a dialog box.
+
+        lpdt->style = DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS;
+        lpdt->cdit = 0;         // Number of controls
+        lpdt->x = 0;
+        lpdt->y = 0;
+
+        // convert the size of the extra controls to the dialog units
+        const wxSize extraSize = GetExtraControlSize();
+        const LONG baseUnits = ::GetDialogBaseUnits();
+        lpdt->cx = ::MulDiv(extraSize.x, 4, LOWORD(baseUnits));
+        lpdt->cy = ::MulDiv(extraSize.y, 8, HIWORD(baseUnits));
+
+        // after the DLGTEMPLATE there are 3 additional WORDs for dialog menu,
+        // class and title, all three set to zeros.
+
+        of.hInstance = (HINSTANCE)lpdt;
+    }
+#endif // __WXWINCE__
+

     // Convert forward slashes to backslashes (file selector doesn't like
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither
     // Convert forward slashes to backslashes (file selector doesn't like
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither


@@ -344,17 +476,17 @@ int wxFileDialog::ShowModal()
         wxChar ch = m_dir[i];
         switch ( ch )
         {
         wxChar ch = m_dir[i];
         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 < len - 1 )
                 {
                     wxChar chNext = m_dir[i + 1];
                 while ( i < len - 1 )
                 {
                     wxChar chNext = m_dir[i + 1];

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

                         break;
 
                     // ignore the next one, unless it is at the start of a UNC path
                         break;
 
                     // ignore the next one, unless it is at the start of a UNC path


@@ -375,12 +507,13 @@ int wxFileDialog::ShowModal()
 
     of.Flags             = msw_flags;
     of.lpfnHook          = wxFileDialogHookFunction;
 
     of.Flags             = msw_flags;
     of.lpfnHook          = wxFileDialogHookFunction;

+    of.lCustData         = (LPARAM)this;

 
     wxArrayString wildDescriptions, wildFilters;
 
     size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
 
 
     wxArrayString wildDescriptions, wildFilters;
 
     size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
 

-    wxASSERT_MSG( items > 0 , _T("empty wildcard list") );
+    wxASSERT_MSG( items > 0 , wxT("empty wildcard list") );

 
     wxString filterBuffer;
 
 
     wxString filterBuffer;
 


@@ -399,13 +532,12 @@ int wxFileDialog::ShowModal()
         }
     }
 
         }
     }
 

-    of.lpstrFilter  = (LPTSTR)filterBuffer.c_str();
+    of.lpstrFilter  = (LPTSTR)filterBuffer.wx_str();

     of.nFilterIndex = m_filterIndex + 1;
 
     //=== Setting defaultFileName >>=========================================
 
     of.nFilterIndex = m_filterIndex + 1;
 
     //=== Setting defaultFileName >>=========================================
 

-    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 );
-    fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');
+    wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));

 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;


@@ -415,9 +547,9 @@ int wxFileDialog::ShowModal()
     // user types "foo" and the default extension is ".bar" we should force it
     // to check for "foo.bar" existence and not "foo")
     wxString defextBuffer; // we need it to be alive until GetSaveFileName()!
     // user types "foo" and the default extension is ".bar" we should force it
     // to check for "foo.bar" existence and not "foo")
     wxString defextBuffer; // we need it to be alive until GetSaveFileName()!

-    if (m_windowStyle & wxFD_SAVE)
+    if (HasFdFlag(wxFD_SAVE))

     {
     {

-        const wxChar* extension = filterBuffer;
+        const wxChar* extension = filterBuffer.wx_str();

         int maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
         for( int i = 0; i < maxFilter; i++ )           // get extension
         int maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
         for( int i = 0; i < maxFilter; i++ )           // get extension


@@ -427,7 +559,7 @@ int wxFileDialog::ShowModal()
         defextBuffer = AppendExtension(wxT("a"), extension);
         if (defextBuffer.StartsWith(wxT("a.")))
         {
         defextBuffer = AppendExtension(wxT("a"), extension);
         if (defextBuffer.StartsWith(wxT("a.")))
         {

-            defextBuffer.Mid(2);
+            defextBuffer = defextBuffer.Mid(2); // remove "a."

             of.lpstrDefExt = defextBuffer.c_str();
         }
     }
             of.lpstrDefExt = defextBuffer.c_str();
         }
     }


@@ -437,120 +569,85 @@ int wxFileDialog::ShowModal()
 
     //== Execute FileDialog >>=================================================
 
 
     //== Execute FileDialog >>=================================================
 

-    DWORD errCode;
-    bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
+    if ( !ShowCommFileDialog(&of, m_windowStyle) )
+        return wxID_CANCEL;

 
 

-#ifdef wxTRY_SMALLER_OPENFILENAME
-    // the system might be too old to support the new version file dialog
-    // boxes, try with the old size
-    if ( !success && errCode == CDERR_STRUCTSIZE &&
-            of.lStructSize != wxOPENFILENAME_V4_SIZE )
+    // GetOpenFileName will always change the current working directory on
+    // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
+    // OFN_NOCHANGEDIR has no effect.  If the user did not specify
+    // wxFD_CHANGE_DIR let's restore the current working directory to what it
+    // was before the dialog was shown.
+    if ( msw_flags & OFN_NOCHANGEDIR )

     {
     {

-        of.lStructSize = wxOPENFILENAME_V4_SIZE;
-
-        success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
-
-        if ( success || !errCode )
-        {
-            // use this struct size for subsequent dialogs
-            gs_ofStructSize = of.lStructSize;
-        }
+        wxSetWorkingDirectory(cwdOrig);

     }
     }

-#endif // wxTRY_SMALLER_OPENFILENAME
-
-    if ( success )
-    {
-        // GetOpenFileName will always change the current working directory on
-        // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
-        // OFN_NOCHANGEDIR has no effect.  If the user did not specify
-        // wxFD_CHANGE_DIR let's restore the current working directory to what it
-        // was before the dialog was shown.
-        if ( msw_flags & OFN_NOCHANGEDIR )
-        {
-            wxSetWorkingDirectory(cwdOrig);
-        }

 
 

-        m_fileNames.Empty();
+    m_fileNames.Empty();

 
 

-        if ( ( m_windowStyle & wxFD_MULTIPLE ) &&
+    if ( ( HasFdFlag(wxFD_MULTIPLE) ) &&

 #if defined(OFN_EXPLORER)
 #if defined(OFN_EXPLORER)

-             ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
+         ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )

 #else
 #else

-             ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') )
+         ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') )

 #endif // OFN_EXPLORER
 #endif // OFN_EXPLORER

-           )
-        {
+       )
+    {

 #if defined(OFN_EXPLORER)
 #if defined(OFN_EXPLORER)

-            m_dir = fileNameBuffer;
-            i = of.nFileOffset;
-            m_fileName = &fileNameBuffer[i];
-            m_fileNames.Add(m_fileName);
-            i += m_fileName.length() + 1;
+        m_dir = fileNameBuffer;
+        i = of.nFileOffset;
+        m_fileName = &fileNameBuffer[i];
+        m_fileNames.Add(m_fileName);
+        i += m_fileName.length() + 1;

 
 

-            while (fileNameBuffer[i] != wxT('\0'))
-            {
-                m_fileNames.Add(&fileNameBuffer[i]);
-                i += wxStrlen(&fileNameBuffer[i]) + 1;
-            }
+        while (fileNameBuffer[i] != wxT('\0'))
+        {
+            m_fileNames.Add(&fileNameBuffer[i]);
+            i += wxStrlen(&fileNameBuffer[i]) + 1;
+        }

 #else
 #else

-            wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n"));
-            m_dir = toke.GetNextToken();
-            m_fileName = toke.GetNextToken();
-            m_fileNames.Add(m_fileName);
+        wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n"));
+        m_dir = toke.GetNextToken();
+        m_fileName = toke.GetNextToken();
+        m_fileNames.Add(m_fileName);

 
 

-            while (toke.HasMoreTokens())
-                m_fileNames.Add(toke.GetNextToken());
+        while (toke.HasMoreTokens())
+            m_fileNames.Add(toke.GetNextToken());

 #endif // OFN_EXPLORER
 
 #endif // OFN_EXPLORER
 

-            wxString dir(m_dir);
-            if ( m_dir.Last() != _T('\\') )
-                dir += _T('\\');
-
-            m_path = dir + m_fileName;
-            m_filterIndex = (int)of.nFilterIndex - 1;
-        }
-        else
-        {
-            //=== Adding the correct extension >>=================================
+        wxString dir(m_dir);
+        if ( m_dir.Last() != wxT('\\') )
+            dir += wxT('\\');

 
 

-            m_filterIndex = (int)of.nFilterIndex - 1;
+        m_path = dir + m_fileName;
+        m_filterIndex = (int)of.nFilterIndex - 1;
+    }
+    else
+    {
+        //=== Adding the correct extension >>=================================

 
 

-            if ( !of.nFileExtension ||
-                 (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
-            {
-                // User has typed a filename without an extension:
-                const wxChar* extension = filterBuffer;
-                int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
+        m_filterIndex = (int)of.nFilterIndex - 1;

 
 

-                for( int i = 0; i < maxFilter; i++ )           // get extension
-                    extension = extension + wxStrlen( extension ) + 1;
+        if ( !of.nFileExtension ||
+             (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
+        {
+            // User has typed a filename without an extension:
+            const wxChar* extension = filterBuffer.wx_str();
+            int   maxFilter = (int)(of.nFilterIndex*2L) - 1;

 
 

-                m_fileName = AppendExtension(fileNameBuffer, extension);
-                wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1));
-                fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0');
-            }
+            for( int i = 0; i < maxFilter; i++ )           // get extension
+                extension = extension + wxStrlen( extension ) + 1;

 
 

-            m_path = fileNameBuffer;
-            m_fileName = wxFileNameFromPath(fileNameBuffer);
-            m_fileNames.Add(m_fileName);
-            m_dir = wxPathOnly(fileNameBuffer);
+            m_fileName = AppendExtension(fileNameBuffer, extension);
+            wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));

         }
         }

-    }
-#ifdef __WXDEBUG__
-    else
-    {
-        // common dialog failed - why?
-        if ( errCode != 0 )
-        {
-            // this msg is only for developers so don't translate it
-            wxLogError(wxT("Common dialog failed with error code %0lx."),
-                       errCode);
+
+        m_path = fileNameBuffer;
+        m_fileName = wxFileNameFromPath(fileNameBuffer);
+        m_fileNames.Add(m_fileName);
+        m_dir = wxPathOnly(fileNameBuffer);

         }
         }

-        //else: it was just cancelled
-    }
-#endif // __WXDEBUG__

 
 

-    return success ? wxID_OK : wxID_CANCEL;
+    return wxID_OK;

 
 }
 
 
 }