fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index e92a4ca990b41cda4afe06ed836e812ffc6afa34..a7999e037b5f1bc785dfc1fc2bf3d4d7b7919cab 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -30,12 +30,11 @@
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/bmpbuttn.h"

+    #include "wx/checkbox.h"
+    #include "wx/choice.h"

 #endif
 
 #endif
 

-#include "wx/checkbox.h"

 #include "wx/textctrl.h"
 #include "wx/textctrl.h"

-#include "wx/choice.h"
-#include "wx/checkbox.h"

 #include "wx/stattext.h"
 #include "wx/longlong.h"
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 #include "wx/longlong.h"
 #include "wx/sizer.h"


@@ -734,7 +733,7 @@ void wxFileCtrl::GoToParentDir()
 {
     if (!IsTopMostDir(m_dirName))
     {
 {
     if (!IsTopMostDir(m_dirName))
     {

-        size_t len = m_dirName.Len();
+        size_t len = m_dirName.length();

         if (wxEndsWithPathSeparator(m_dirName))
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         if (wxEndsWithPathSeparator(m_dirName))
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );


@@ -1028,7 +1027,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
             m_dir = wxFILE_SEP_PATH;
     }
 
             m_dir = wxFILE_SEP_PATH;
     }
 

-    size_t len = m_dir.Len();
+    size_t len = m_dir.length();

     if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
         m_dir.Remove( len-1, 1 );
 
     if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
         m_dir.Remove( len-1, 1 );