Doc tweaks

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index a39f76d034e245098bd2e9c74218256937c5d697..6eeb171d42b3a34f3938905a5667a0d11a532005 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -140,7 +140,7 @@ int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)

-#define IsTopMostDir(dir)   (dir.IsEmpty())
+#define IsTopMostDir(dir)   (dir.empty())

 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)


@@ -200,7 +200,13 @@ void wxFileData::ReadData()
     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
 #else // no lstat()
     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
 #else // no lstat()

+    // only translate to file charset if we don't go by our
+    // wxStat implementation
+#ifndef wxNEED_WX_UNISTD_H
+    wxStat( m_filePath.fn_str() , &buff );
+#else

     wxStat( m_filePath, &buff );
     wxStat( m_filePath, &buff );

+#endif

 #endif
 
     m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
 #endif
 
     m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;


@@ -501,20 +507,20 @@ void wxFileCtrl::UpdateFiles()
 
 #if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
     if ( IsTopMostDir(m_dirName) )
 
 #if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
     if ( IsTopMostDir(m_dirName) )

-        {
+    {

         wxArrayString names, paths;
         wxArrayInt icons;
         size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
         for (n=0; n<count; n++)
         wxArrayString names, paths;
         wxArrayInt icons;
         size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
         for (n=0; n<count; n++)

-            {
+        {

             wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
             if (Add(fd, item) != -1)
                 item.m_itemId++;
             else
                 delete fd;
             wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
             if (Add(fd, item) != -1)
                 item.m_itemId++;
             else
                 delete fd;

-            }

         }
         }

+    }

     else
 #endif // defined(__DOS__) || defined(__WINDOWS__)
     {
     else
 #endif // defined(__DOS__) || defined(__WINDOWS__)
     {


@@ -523,7 +529,7 @@ void wxFileCtrl::UpdateFiles()
         {
             wxString p(wxPathOnly(m_dirName));
 #if defined(__UNIX__) && !defined(__OS2__)
         {
             wxString p(wxPathOnly(m_dirName));
 #if defined(__UNIX__) && !defined(__OS2__)

-            if (p.IsEmpty()) p = wxT("/");
+            if (p.empty()) p = wxT("/");

 #endif // __UNIX__
             wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
             if (Add(fd, item) != -1)
 #endif // __UNIX__
             wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
             if (Add(fd, item) != -1)


@@ -654,18 +660,18 @@ void wxFileCtrl::GoToParentDir()
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

-        if (!m_dirName.IsEmpty())
+        if (!m_dirName.empty())

         {
             if (m_dirName.Last() == wxT('.'))
                 m_dirName = wxEmptyString;
         }
 #elif defined(__UNIX__)
         {
             if (m_dirName.Last() == wxT('.'))
                 m_dirName = wxEmptyString;
         }
 #elif defined(__UNIX__)

-        if (m_dirName.IsEmpty())
+        if (m_dirName.empty())

             m_dirName = wxT("/");
 #endif
         UpdateFiles();
         long id = FindItem( 0, fname );
             m_dirName = wxT("/");
 #endif
         UpdateFiles();
         long id = FindItem( 0, fname );

-        if (id != -1)
+        if (id != wxNOT_FOUND)

         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );


@@ -729,7 +735,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
     wxASSERT( fd );
 
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
     wxASSERT( fd );
 

-    if ((event.GetLabel().IsEmpty()) ||
+    if ((event.GetLabel().empty()) ||

         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))


@@ -870,11 +876,29 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& defaultFile,
                            const wxString& wildCard,
                            long style,
                            const wxString& defaultFile,
                            const wxString& wildCard,
                            long style,

-                           const wxPoint& pos )
+                           const wxPoint& pos,
+                           bool bypassGenericImpl )

                     :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
 {
                     :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
 {

-    wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
-                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
+    m_bypassGenericImpl = bypassGenericImpl;
+
+    if (!m_bypassGenericImpl)
+        Create( parent, message, defaultDir, defaultFile, wildCard, style, pos );
+}
+
+bool wxGenericFileDialog::Create( wxWindow *parent,
+                                  const wxString& message,
+                                  const wxString& WXUNUSED(defaultDir),
+                                  const wxString& defaultFile,
+                                  const wxString& wildCard,
+                                  long WXUNUSED(style),
+                                  const wxPoint& pos )
+{
+    if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
+                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
+    {
+        return false;
+    }

 
     if (wxConfig::Get(false))
     {
 
     if (wxConfig::Get(false))
     {


@@ -971,7 +995,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         style2 |= wxLC_SINGLE_SEL;
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL,
         style2 |= wxLC_SINGLE_SEL;
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL,

-                             _T(""), ms_lastShowHidden,
+                             wxEmptyString, ms_lastShowHidden,

                              wxDefaultPosition, wxSize(540,200),
                              style2);
 
                              wxDefaultPosition, wxSize(540,200),
                              style2);
 


@@ -1025,22 +1049,27 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     Centre( wxBOTH );
 
     m_text->SetFocus();
     Centre( wxBOTH );
 
     m_text->SetFocus();

+
+    return true;

 }
 
 wxGenericFileDialog::~wxGenericFileDialog()
 {
 }
 
 wxGenericFileDialog::~wxGenericFileDialog()
 {

-    if (wxConfig::Get(false))
+    if (!m_bypassGenericImpl)

     {
     {

-        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
-                               ms_lastViewStyle);
-        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
-                               ms_lastShowHidden);
-    }
+        if (wxConfig::Get(false))
+        {
+            wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+                                   ms_lastViewStyle);
+            wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+                                   ms_lastShowHidden);
+        }

 
 

-    const int count = m_choice->GetCount();
-    for ( int i = 0; i < count; i++ )
-    {
-        delete (wxString *)m_choice->GetClientData(i);
+        const int count = m_choice->GetCount();
+        for ( int i = 0; i < count; i++ )
+        {
+            delete (wxString *)m_choice->GetClientData(i);
+        }

     }
 }
 
     }
 }
 


@@ -1171,7 +1200,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
 {
     wxString filename( fn );
     wxString dir = m_list->GetDir();
 {
     wxString filename( fn );
     wxString dir = m_list->GetDir();

-    if (filename.IsEmpty()) return;
+    if (filename.empty()) return;

     if (filename == wxT(".")) return;
 
     // "some/place/" means they want to chdir not try to load "place"
     if (filename == wxT(".")) return;
 
     // "some/place/" means they want to chdir not try to load "place"


@@ -1198,7 +1227,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
 
     if (filename.BeforeFirst(wxT('/')) == wxT("~"))
     {
 
     if (filename.BeforeFirst(wxT('/')) == wxT("~"))
     {

-        filename = wxGetUserHome() + filename.Remove(0, 1);
+        filename = wxString(wxGetUserHome()) + filename.Remove(0, 1);

     }
 #endif // __UNIX__
 
     }
 #endif // __UNIX__