Don't use margins for wxGrid in place text editor controls.

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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index b5009721aaa6bdf45a14ecf7ac08b8a3623d6dad..ffe936ea9636c5811fcfcb33cfc89ee086e9b007 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -35,7 +35,7 @@
 #include "wx/tokenzr.h"
 #include "wx/imaglist.h"
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     #include "wx/msw/wrapwin.h"
 #endif
 
@@ -53,7 +53,7 @@
 // ----------------------------------------------------------------------------
 
 static
-int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
@@ -71,7 +71,7 @@ int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder
 }
 
 static
-int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
@@ -93,7 +93,7 @@ int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder)
 }
 
 static
-int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
@@ -115,7 +115,7 @@ int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder)
 }
 
 static
-int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
@@ -223,32 +223,39 @@ void wxFileData::ReadData()
     wxStructStat buff;
 
 #if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
-    lstat( m_filePath.fn_str(), &buff );
-    m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
+    const bool hasStat = lstat( m_filePath.fn_str(), &buff ) == 0;
+    if ( hasStat )
+        m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
 #else // no lstat()
-    wxStat( m_filePath, &buff );
+    const bool hasStat = wxStat( m_filePath, &buff ) == 0;
 #endif
 
-    m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
-    m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
+    if ( hasStat )
+    {
+        m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
+        m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
 
-    m_size = buff.st_size;
+        m_size = buff.st_size;
 
-    m_dateTime = buff.st_mtime;
+        m_dateTime = buff.st_mtime;
+    }
 #endif
     // __WXWINCE__
 
 #if defined(__UNIX__)
-    m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"),
-                         buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'),
-                         buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'),
-                         buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-'));
+    if ( hasStat )
+    {
+        m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"),
+                             buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'),
+                             buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'),
+                             buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'),
+                             buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'),
+                             buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'),
+                             buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'),
+                             buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'),
+                             buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'),
+                             buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-'));
+    }
 #elif defined(__WIN32__)
     DWORD attribs = ::GetFileAttributes(m_filePath.c_str());
     if (attribs != (DWORD)-1)
@@ -883,9 +890,9 @@ wxFileListCtrl::~wxFileListCtrl()
 // wxGenericFileCtrl implementation
 ///////////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
 
-BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxPanel )
+BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
     EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected )
     EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated )
     EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter )
@@ -916,7 +923,11 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
     wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ),
                   wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) );
 
-    wxPanel::Create( parent, id, pos, size, wxTAB_TRAVERSAL, name );
+    wxNavigationEnabled<wxControl>::Create( parent, id,
+                                            pos, size,
+                                            wxTAB_TRAVERSAL,
+                                            wxDefaultValidator,
+                                            name );
 
     m_dir = defaultDirectory;