corrected error in last fix for insert items

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 9d744f9b1261b16c283e2631b618b5ffa19234ed..efc8f3e290faa06b245a2823fbe09c58b150fa40 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -145,7 +145,7 @@ int wxFileDataTimeCompare( long data1, long data2, long data)
 #define IsTopMostDir(dir)   (dir.IsEmpty())
 #endif
 
 #define IsTopMostDir(dir)   (dir.IsEmpty())
 #endif
 

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

 // defined in src/generic/dirctrlg.cpp
 extern bool wxIsDriveAvailable(const wxString& dirName);
 #endif
 // defined in src/generic/dirctrlg.cpp
 extern bool wxIsDriveAvailable(const wxString& dirName);
 #endif


@@ -253,24 +253,25 @@ wxString wxFileData::GetHint() const
 {
     wxString s = m_filePath;
     s += wxT("  ");
 {
     wxString s = m_filePath;
     s += wxT("  ");

+

     if (IsDir())
     if (IsDir())

-        s += wxT("<DIR> ");
+        s += _("<DIR>");

     else if (IsLink())
     else if (IsLink())

-        s += wxT("<LINK> ");
+        s += _("<LINK>");

     else if (IsDrive())
     else if (IsDrive())

+        s += _("<DRIVE>");
+    else // plain file
+        s += wxString::Format( _("%ld bytes"), m_size );
+
+    s += wxT(' ');
+
+    if ( !IsDrive() )

     {
     {

-        s += wxT("<DRIVE> ");
-        return s;
-    }
-    else
-    {
-        s += LongToString( m_size );
-        s += wxT(" bytes ");
+        s << GetModificationTime()
+          << wxT("  ")
+          << m_permissions;

     }
 
     }
 

-    s += GetModificationTime();
-    s += wxT("  ");
-    s += m_permissions;

     return s;
 };
 
     return s;
 };
 


@@ -872,7 +873,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         m_filterExtension = wxEmptyString;
 
     // layout
         m_filterExtension = wxEmptyString;
 
     // layout

-    
+

     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );


@@ -987,8 +988,6 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 
         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 

-    // FIXME - memory leaks!!
-    

     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {
     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {