mac paths updated

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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index 5427143e0121267ac1d39c42580bdc405979a05c..e6404bfad6e9271399ed68ad64d6ccd80ffa0a9c 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -28,7 +28,6 @@
     #include "wx/filedlg.h"
 #endif
 
     #include "wx/filedlg.h"
 #endif
 

-#include "wx/filename.h"

 #include "wx/clntdata.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable
 #include "wx/clntdata.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable


@@ -913,6 +912,7 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
     this->m_style = style;
     m_inSelected = false;
     m_noSelChgEvent = false;
     this->m_style = style;
     m_inSelected = false;
     m_noSelChgEvent = false;

+    m_check = NULL;

 
     // check that the styles are not contradictory
     wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ),
 
     // check that the styles are not contradictory
     wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ),


@@ -948,10 +948,11 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if ( is_pda )
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if ( is_pda )

-        staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ), 0, wxRIGHT, 10 );
+        staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ),
+                          wxSizerFlags().DoubleBorder(wxRIGHT) );

     m_static = new wxStaticText( this, wxID_ANY, m_dir );
     staticsizer->Add( m_static, 1 );
     m_static = new wxStaticText( this, wxID_ANY, m_dir );
     staticsizer->Add( m_static, 1 );

-    mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
+    mainsizer->Add( staticsizer, wxSizerFlags().Expand().Border());

 
     long style2 = wxLC_LIST;
     if ( !( m_style & wxFC_MULTIPLE ) )
 
     long style2 = wxLC_LIST;
     if ( !( m_style & wxFC_MULTIPLE ) )


@@ -980,33 +981,25 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() );

+        textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );

         mainsizer->Add( textsizer, wxSizerFlags().Expand() );
 
         mainsizer->Add( textsizer, wxSizerFlags().Expand() );
 

-        m_check = NULL;
-        textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );

     }
     else // !is_pda
     {
     }
     else // !is_pda
     {

-        mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().DoubleHorzBorder() );
-
-        wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
-        textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().
-                        DoubleBorder( wxLEFT | wxRIGHT | wxTOP ) );
-        mainsizer->Add( textsizer, wxSizerFlags().Expand() );
-
-        wxSizerFlags flagsCentre;
-        flagsCentre.Centre().DoubleBorder();
+        mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().Border() );
+        mainsizer->Add( m_text, wxSizerFlags().Expand().Border() );

 
         wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
 
         wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );

-        choicesizer->Add( m_choice, wxSizerFlags( flagsCentre ).Proportion( 1 ) );
+        choicesizer->Add( m_choice, wxSizerFlags( 1 ).Centre() );

 
         if ( !( m_style & wxFC_NOSHOWHIDDEN ) )
 
         if ( !( m_style & wxFC_NOSHOWHIDDEN ) )

-            {
+        {

             m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) );
             m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) );

-            choicesizer->Add( m_check, flagsCentre );
-            }
+            choicesizer->Add( m_check, wxSizerFlags().Centre().DoubleBorder(wxLEFT) );
+        }

 
 

-        mainsizer->Add( choicesizer, wxSizerFlags().Expand() );
+        mainsizer->Add( choicesizer, wxSizerFlags().Expand().Border() );

     }
 
     SetWildcard( wildCard );
     }
 
     SetWildcard( wildCard );


@@ -1031,67 +1024,102 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

+// NB: there is an unfortunate mismatch between wxFileName and wxFileDialog
+//     method names but our GetDirectory() does correspond to wxFileName::
+//     GetPath() while our GetPath() is wxFileName::GetFullPath()

 wxString wxGenericFileCtrl::GetPath() const
 {
 wxString wxGenericFileCtrl::GetPath() const
 {

-    return DoGetFilename( true );
+    wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetPaths() instead" );
+
+    return DoGetFileName().GetFullPath();

 }
 
 wxString wxGenericFileCtrl::GetFilename() const
 {
 }
 
 wxString wxGenericFileCtrl::GetFilename() const
 {

-    return DoGetFilename( false );
+    wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetFilenames() instead" );
+
+    return DoGetFileName().GetFullName();

 }
 
 }
 

-wxString wxGenericFileCtrl::DoGetFilename( const bool fullPath ) const
+wxString wxGenericFileCtrl::GetDirectory() const

 {
 {

-    wxASSERT_MSG( ( m_style & wxFC_MULTIPLE ) == 0,
-                  wxT( "With controls that has wxFC_MULTIPLE style " )
-                  wxT( "use GetFilenames/GetPaths to get all filenames/paths selected" ) );
+    // don't check for wxFC_MULTIPLE here, this one is probably safe to call in
+    // any case as it can be always taken to mean "current directory"
+    return DoGetFileName().GetPath();
+}

 
 

-    const wxString value = m_text->GetValue();
+wxFileName wxGenericFileCtrl::DoGetFileName() const
+{
+    wxFileName fn;

 
 

-    if ( !value.empty() )
-        return value;
-    return fullPath ? ( GetProperFileListDir() + value ) : value;
+    wxString value = m_text->GetValue();
+    if ( value.empty() )
+    {
+        // nothing in the text control, get the selected file from the list
+        wxListItem item;
+        item.m_itemId = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
+                                            wxLIST_STATE_SELECTED);
+        m_list->GetItem(item);
+
+        fn.Assign(m_list->GetDir(), item.m_text);
+    }
+    else // user entered the value
+    {
+        // the path can be either absolute or relative
+        fn.Assign(value);
+        if ( fn.IsRelative() )
+            fn.MakeAbsolute(m_list->GetDir());
+    }
+
+    return fn;

 }
 
 }
 

-void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const
+// helper used in DoGetFilenames() and needed because Borland can't compile
+// operator?: inline
+static inline wxString GetFileNameOrPath(const wxFileName& fn, bool fullPath)

 {
 {

-    filenames.Empty();
+    return fullPath ? fn.GetFullPath() : fn.GetFullName();
+}

 
 

-    const wxString dir = GetProperFileListDir();
-    const wxString value = m_text->GetValue();
+void
+wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const
+{
+    filenames.clear();
+
+    const wxString dir = m_list->GetDir();

 
 

+    const wxString value = m_text->GetValue();

     if ( !value.empty() )
     {
     if ( !value.empty() )
     {

-        if ( fullPath )
-            filenames.Add( dir + value );
-        else
-            filenames.Add( value );
+        wxFileName fn(value);
+        if ( fn.IsRelative() )
+            fn.MakeAbsolute(dir);
+
+        filenames.push_back(GetFileNameOrPath(fn, fullPath));

         return;
     }
 
         return;
     }
 

-    if ( m_list->GetSelectedItemCount() == 0 )
-    {
+    const int numSel = m_list->GetSelectedItemCount();
+    if ( !numSel )

         return;
         return;

-    }

 
 

-    filenames.Alloc( m_list->GetSelectedItemCount() );
+    filenames.reserve(numSel);

 
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT;
 
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT;

-
-    item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 )
+    item.m_itemId = -1;
+    for ( ;; )

     {
     {

-        m_list->GetItem( item );
+        item.m_itemId = m_list->GetNextItem(item.m_itemId, wxLIST_NEXT_ALL,
+                                            wxLIST_STATE_SELECTED);
+
+        if ( item.m_itemId == -1 )
+            break;

 
 

-        if ( fullPath )
-            filenames.Add( dir + item.m_text );
-        else
-            filenames.Add( item.m_text );
+        m_list->GetItem(item);

 
 

-        item.m_itemId = m_list->GetNextItem( item.m_itemId,
-                                             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+        const wxFileName fn(dir, item.m_text);
+        filenames.push_back(GetFileNameOrPath(fn, fullPath));

     }
 }
 
     }
 }
 


@@ -1105,11 +1133,6 @@ bool wxGenericFileCtrl::SetDirectory( const wxString& dir )
     return wxFileName( dir ).SameAs( m_list->GetDir() );
 }
 
     return wxFileName( dir ).SameAs( m_list->GetDir() );
 }
 

-wxString wxGenericFileCtrl::GetDirectory() const
-{
-    return m_list->GetDir();
-}
-

 bool wxGenericFileCtrl::SetFilename( const wxString& name )
 {
     const long item = m_list->FindItem( -1, name );
 bool wxGenericFileCtrl::SetFilename( const wxString& name )
 {
     const long item = m_list->FindItem( -1, name );


@@ -1149,9 +1172,11 @@ bool wxGenericFileCtrl::SetFilename( const wxString& name )
 
 void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
 {
 
 void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
 {

-    const wxString& str = (wx_static_cast(wxStringClientData *,
-                            m_choice->GetClientObject( filterindex )))
-                            ->GetData();
+    wxClientData *pcd = m_choice->GetClientObject( filterindex );
+    if ( !pcd )
+        return;
+
+    const wxString& str = ((wx_static_cast(wxStringClientData *, pcd))->GetData());

     m_list->SetWild( str );
     m_filterIndex = filterindex;
     if ( str.Left( 2 ) == wxT( "*." ) )
     m_list->SetWild( str );
     m_filterIndex = filterindex;
     if ( str.Left( 2 ) == wxT( "*." ) )


@@ -1444,17 +1469,4 @@ void wxGenericFileCtrl::GoToHomeDir()
     UpdateControls();
 }
 
     UpdateControls();
 }
 

-wxString wxGenericFileCtrl::GetProperFileListDir() const
-{
-    wxString dir = m_list->GetDir();
-#ifdef __UNIX__
-    if ( dir != wxT( "/" ) )
-#elif defined(__WXWINCE__)
-    if ( dir != wxT( "/" ) && dir != wxT( "\\" ) )
-#endif
-        dir += wxFILE_SEP_PATH;
-
-    return dir;
-}
-

 #endif // wxUSE_FILECTRL
 #endif // wxUSE_FILECTRL