added SpinCtrl,

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index c169071d01e44328bfb40b330a8f354226d5d47b..265e8cb39e3fc97f3eeb003ad0c987ff77d88446 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     12/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     12/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -56,12 +56,12 @@ static char * folder_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 6 1",
 /* colors */
 /* width height ncolors chars_per_pixel */
 "16 16 6 1",
 /* colors */

-"      s None  c None",
-".     c #000000",
-"+     c #c0c0c0",
-"@     c #808080",
-"#     c #ffff00",
-"$     c #ffffff",
+"         s None        c None",
+".        c #000000",
+"+        c #c0c0c0",
+"@        c #808080",
+"#        c #ffff00",
+"$        c #ffffff",

 /* pixels */
 "                ",
 "   @@@@@        ",
 /* pixels */
 "                ",
 "   @@@@@        ",


@@ -80,6 +80,22 @@ static char * folder_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static
+int ListCompare( long data1, long data2, long WXUNUSED(data) )
+{
+     wxFileData *fd1 = (wxFileData*)data1 ;
+     wxFileData *fd2 = (wxFileData*)data2 ;
+     if (fd1->GetName() == wxT("..")) return -1;
+     if (fd2->GetName() == wxT("..")) return 1;
+     if (fd1->IsDir() && !fd2->IsDir()) return -1;
+     if (fd2->IsDir() && !fd1->IsDir()) return 1;
+     return strcmp( fd1->GetName(), fd2->GetName() );
+}
+

 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------


@@ -90,7 +106,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
 {
     m_name = name;
     m_fileName = fname;
 {
     m_name = name;
     m_fileName = fname;

-    
+

     struct stat buff;
     stat( m_fileName.GetData(), &buff );
     struct stat lbuff;
     struct stat buff;
     stat( m_fileName.GetData(), &buff );
     struct stat lbuff;


@@ -112,7 +128,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     m_day = t->tm_mday;
     m_year = t->tm_year;
 
     m_day = t->tm_mday;
     m_year = t->tm_year;
 

-    m_permissions.sprintf( "%c%c%c", 
+    m_permissions.sprintf( "%c%c%c",

      ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? 'r' : '-'),
      ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? 'w' : '-'),
      ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? 'x' : '-') );
      ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? 'r' : '-'),
      ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? 'w' : '-'),
      ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? 'x' : '-') );


@@ -140,20 +156,20 @@ wxString wxFileData::GetHint() const
         s += _(" bytes ");
     }
     s += IntToString( m_day );
         s += _(" bytes ");
     }
     s += IntToString( m_day );

-    s += _T(".");
+    s += wxT(".");

     s += IntToString( m_month );
     s += IntToString( m_month );

-    s += _T(".");
+    s += wxT(".");

     s += IntToString( m_year );
     s += IntToString( m_year );

-    s += _T("  ");
+    s += wxT("  ");

     s += IntToString( m_hour );
     s += IntToString( m_hour );

-    s += _T(":");
+    s += wxT(":");

     s += IntToString( m_minute );
     s += IntToString( m_minute );

-    s += _T("  ");
+    s += wxT("  ");

     s += m_permissions;
     return s;
 };
 
     s += m_permissions;
     return s;
 };
 

-wxString wxFileData::GetEntry( const int num )
+wxString wxFileData::GetEntry( int num )

 {
     wxString s;
     switch (num)
 {
     wxString s;
     switch (num)


@@ -167,27 +183,27 @@ wxString wxFileData::GetEntry( const int num )
             else s = LongToString( m_size );
             break;
         case 2:
             else s = LongToString( m_size );
             break;
         case 2:

-            if (m_day < 10) s = _T("0"); else s = _T("");
+            if (m_day < 10) s = wxT("0"); else s = wxT("");

             s += IntToString( m_day );
             s += IntToString( m_day );

-            s += _T(".");
-            if (m_month < 10) s += _T("0"); 
+            s += wxT(".");
+            if (m_month < 10) s += wxT("0");

             s += IntToString( m_month );
             s += IntToString( m_month );

-            s += _T(".");
-            if (m_year < 10) s += _T("0"); // this should happen real soon...
+            s += wxT(".");
+            if (m_year < 10) s += wxT("0"); // this should happen real soon...

             s += IntToString( m_year );
             break;
         case 3:
             s += IntToString( m_year );
             break;
         case 3:

-            if (m_hour < 10) s = _T("0"); else s = _T("");
+            if (m_hour < 10) s = wxT("0"); else s = wxT("");

             s += IntToString( m_hour );
             s += IntToString( m_hour );

-            s += _T(":");
-            if (m_minute < 10) s += _T("0");
+            s += wxT(":");
+            if (m_minute < 10) s += wxT("0");

             s += IntToString( m_minute );
             break;
         case 4:
             s = m_permissions;
             break;
         default:
             s += IntToString( m_minute );
             break;
         case 4:
             s = m_permissions;
             break;
         default:

-            s = _T("No entry");
+            s = wxT("No entry");

             break;
     }
     return s;
             break;
     }
     return s;


@@ -233,7 +249,7 @@ void wxFileData::MakeItem( wxListItem &item )
     }
     item.m_data = (long)this;
 }
     }
     item.m_data = (long)this;
 }

-  
+

 //-----------------------------------------------------------------------------
 //  wxFileCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxFileCtrl
 //-----------------------------------------------------------------------------


@@ -247,11 +263,11 @@ END_EVENT_TABLE()
 
 wxFileCtrl::wxFileCtrl()
 {
 
 wxFileCtrl::wxFileCtrl()
 {

-    m_dirName = _T("/");
+    m_dirName = wxT("/");

     m_showHidden = FALSE;
 }
 
     m_showHidden = FALSE;
 }
 

-wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id, 
+wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id,

     const wxString &dirName, const wxString &wild,
     const wxPoint &pos, const wxSize &size,
     long style, const wxValidator &validator, const wxString &name ) :
     const wxString &dirName, const wxString &wild,
     const wxPoint &pos, const wxSize &size,
     long style, const wxValidator &validator, const wxString &name ) :


@@ -260,7 +276,7 @@ wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id,
     wxImageList *imageList = new wxImageList( 16, 16 );
     imageList->Add( wxBitmap( folder_xpm ) );
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
     wxImageList *imageList = new wxImageList( 16, 16 );
     imageList->Add( wxBitmap( folder_xpm ) );
     SetImageList( imageList, wxIMAGE_LIST_SMALL );

-    
+

     m_dirName = dirName;
     m_wild = wild;
     m_showHidden = FALSE;
     m_dirName = dirName;
     m_wild = wild;
     m_showHidden = FALSE;


@@ -291,17 +307,6 @@ void wxFileCtrl::ShowHidden( bool show )
     Update();
 }
 
     Update();
 }
 

-int ListCompare( const long data1, const long data2, const long WXUNUSED(data) )
-{
-     wxFileData *fd1 = (wxFileData*)data1 ;
-     wxFileData *fd2 = (wxFileData*)data2 ;
-     if (fd1->GetName() == _T("..")) return -1;
-     if (fd2->GetName() == _T("..")) return 1;
-     if (fd1->IsDir() && !fd2->IsDir()) return -1;
-     if (fd2->IsDir() && !fd1->IsDir()) return 1;
-     return strcmp( fd1->GetName(), fd2->GetName() );
-}
-

 long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 {
     long ret = -1;
 long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 {
     long ret = -1;


@@ -316,12 +321,12 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
     else if (my_style & wxLC_LIST)
     {
         ret = InsertItem( item );
     else if (my_style & wxLC_LIST)
     {
         ret = InsertItem( item );

-    } 
+    }

     return ret;
 }
 
 void wxFileCtrl::Update()
     return ret;
 }
 
 void wxFileCtrl::Update()

-{ 
+{

     ClearAll();
     long my_style = GetWindowStyleFlag();
     if (my_style & wxLC_REPORT)
     ClearAll();
     long my_style = GetWindowStyleFlag();
     if (my_style & wxLC_REPORT)


@@ -337,45 +342,45 @@ void wxFileCtrl::Update()
     item.m_itemId = 0;
     item.m_col = 0;
 
     item.m_itemId = 0;
     item.m_col = 0;
 

-    if (m_dirName != _T("/"))
+    if (m_dirName != wxT("/"))

     {
         wxString p( wxPathOnly(m_dirName) );
     {
         wxString p( wxPathOnly(m_dirName) );

-       if (p.IsEmpty()) p = _T("/");
-        fd = new wxFileData( _T(".."), p );
-       Add( fd, item );
+        if (p.IsEmpty()) p = wxT("/");
+        fd = new wxFileData( wxT(".."), p );
+        Add( fd, item );

         item.m_itemId++;
     }
 
         item.m_itemId++;
     }
 

-    wxString res = m_dirName + _T("/*");
+    wxString res = m_dirName + wxT("/*");

     wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
     while (!f.IsEmpty())
     {
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();
     wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
     while (!f.IsEmpty())
     {
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();

-        if (m_showHidden || (s[0] != _T('.')))
+        if (m_showHidden || (s[0] != wxT('.')))

         {
         {

-           Add( fd, item );
+            Add( fd, item );

             item.m_itemId++;
         }
         f = wxFindNextFile();
     }
             item.m_itemId++;
         }
         f = wxFindNextFile();
     }

-    
-    res = m_dirName + _T("/") + m_wild;
+
+    res = m_dirName + wxT("/") + m_wild;

     f = wxFindFirstFile( res.GetData(), wxFILE );
     while (!f.IsEmpty())
     {
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();
     f = wxFindFirstFile( res.GetData(), wxFILE );
     while (!f.IsEmpty())
     {
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();

-        if (m_showHidden || (s[0] != _T('.')))
+        if (m_showHidden || (s[0] != wxT('.')))

         {
         {

-           Add( fd, item );
+            Add( fd, item );

             item.m_itemId++;
         }
         f = wxFindNextFile();
     }
             item.m_itemId++;
         }
         f = wxFindNextFile();
     }

-    
+

     SortItems( ListCompare, 0 );
 }
 
     SortItems( ListCompare, 0 );
 }
 


@@ -387,32 +392,32 @@ void wxFileCtrl::SetWild( const wxString &wild )
 
 void wxFileCtrl::MakeDir()
 {
 
 void wxFileCtrl::MakeDir()
 {

-    wxString new_name( _T("NewName") );
+    wxString new_name( wxT("NewName") );

     wxString path( m_dirName );
     wxString path( m_dirName );

-    path += _T( "/" );
+    path += wxT("/");

     path += new_name;
     if (wxFileExists(path))
     {
         // try NewName0, NewName1 etc.
         int i = 0;
     path += new_name;
     if (wxFileExists(path))
     {
         // try NewName0, NewName1 etc.
         int i = 0;

-       do {
+        do {

             new_name = _("NewName");
             new_name = _("NewName");

-           wxString num;
-           num.Printf( _T("%d"), i );
-           new_name += num;
-           
+            wxString num;
+            num.Printf( wxT("%d"), i );
+            new_name += num;
+

             path = m_dirName;
             path = m_dirName;

-            path += _T("/");
+            path += wxT("/");

             path += new_name;
             path += new_name;

-           i++;
-       } while (wxFileExists(path));
+            i++;
+        } while (wxFileExists(path));

     }
     }

-       
+

     wxLogNull log;
     wxLogNull log;

-    if (!wxMkdir(path)) 
+    if (!wxMkdir(path))

     {
         wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
     {
         wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );

-       dialog.ShowModal();
+        dialog.ShowModal();

         return;
     }
 
         return;
     }
 


@@ -421,11 +426,11 @@ void wxFileCtrl::MakeDir()
     item.m_itemId = 0;
     item.m_col = 0;
     int id = Add( fd, item );
     item.m_itemId = 0;
     item.m_col = 0;
     int id = Add( fd, item );

-    
+

     if (id != -1)
     {
         SortItems( ListCompare, 0 );
     if (id != -1)
     {
         SortItems( ListCompare, 0 );

-       id = FindItem( 0, (long)fd );
+        id = FindItem( 0, (long)fd );

         EnsureVisible( id );
         EditLabel( id );
     }
         EnsureVisible( id );
         EditLabel( id );
     }


@@ -433,18 +438,18 @@ void wxFileCtrl::MakeDir()
 
 void wxFileCtrl::GoToParentDir()
 {
 
 void wxFileCtrl::GoToParentDir()
 {

-    if (m_dirName != _T("/"))
+    if (m_dirName != wxT("/"))

     {
     {

-       wxString fname( wxFileNameFromPath(m_dirName) );
+        wxString fname( wxFileNameFromPath(m_dirName) );

         m_dirName = wxPathOnly( m_dirName );
         m_dirName = wxPathOnly( m_dirName );

-       if (m_dirName.IsEmpty()) m_dirName = _T("/");
+        if (m_dirName.IsEmpty()) m_dirName = wxT("/");

         Update();
         Update();

-       int id = FindItem( 0, fname );
-       if (id != -1)
-       {
-           SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-           EnsureVisible( id );
-       }
+        int id = FindItem( 0, fname );
+        if (id != -1)
+        {
+            SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+            EnsureVisible( id );
+        }

     }
 }
 
     }
 }
 


@@ -480,41 +485,41 @@ 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()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
     if ((event.GetLabel().IsEmpty()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||

-       (event.GetLabel().First( _T("/") ) != wxNOT_FOUND))
+        (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND))

     {
         wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
     {
         wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );

-       dialog.ShowModal();
+        dialog.ShowModal();

         event.Veto();
         event.Veto();

-       return;
+        return;

     }
     }

-    
+

     wxString new_name( wxPathOnly( fd->GetFullName() ) );
     wxString new_name( wxPathOnly( fd->GetFullName() ) );

-    new_name += _T("/");
+    new_name += wxT("/");

     new_name += event.GetLabel();
     new_name += event.GetLabel();

-    
+

     wxLogNull log;
     wxLogNull log;

-    
+

     if (wxFileExists(new_name))
     {
         wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );
     if (wxFileExists(new_name))
     {
         wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );

-       dialog.ShowModal();
+        dialog.ShowModal();

         event.Veto();
     }
         event.Veto();
     }

-    
+

     if (wxRenameFile(fd->GetFullName(),new_name))
     {
         fd->SetNewName( new_name, event.GetLabel() );
     if (wxRenameFile(fd->GetFullName(),new_name))
     {
         fd->SetNewName( new_name, event.GetLabel() );

-       SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+        SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );

         EnsureVisible( event.GetItem() );
     }
     else
     {
         wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
         EnsureVisible( event.GetItem() );
     }
     else
     {
         wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );

-       dialog.ShowModal();
+        dialog.ShowModal();

         event.Veto();
     }
 }
         event.Veto();
     }
 }


@@ -523,14 +528,15 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
 // wxFileDialog
 //-----------------------------------------------------------------------------
 

-#define  ID_LIST_MODE     5000
-#define  ID_REPORT_MODE   5001
-#define  ID_UP_DIR        5005
-#define  ID_PARENT_DIR    5006
-#define  ID_NEW_DIR       5007
-#define  ID_CHOICE        5008
-#define  ID_TEXT          5009
-#define  ID_LIST_CTRL     5010
+#define  ID_LIST_MODE     wxID_FILEDLGG
+#define  ID_REPORT_MODE   wxID_FILEDLGG + 1
+#define  ID_UP_DIR        wxID_FILEDLGG + 5
+#define  ID_PARENT_DIR    wxID_FILEDLGG + 6
+#define  ID_NEW_DIR       wxID_FILEDLGG + 7
+#define  ID_CHOICE        wxID_FILEDLGG + 8
+#define  ID_TEXT          wxID_FILEDLGG + 9
+#define  ID_LIST_CTRL     wxID_FILEDLGG + 10
+#define  ID_ACTIVATED     wxID_FILEDLGG + 11

 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 


@@ -542,9 +548,9 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
         EVT_BUTTON(ID_NEW_DIR, wxFileDialog::OnNew)
         EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk)
         EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected)
         EVT_BUTTON(ID_NEW_DIR, wxFileDialog::OnNew)
         EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk)
         EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected)

-       EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
-       EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
-       EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
+        EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
+        EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
+        EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)

 END_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent,
 END_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent,


@@ -557,28 +563,28 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
   wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
 {
     wxBeginBusyCursor();
   wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
 {
     wxBeginBusyCursor();

-    
+

     m_message = message;
     m_dialogStyle = style;
     m_dir = defaultDir;
     if (m_dir.IsEmpty())
     {
         char buf[200];
     m_message = message;
     m_dialogStyle = style;
     m_dir = defaultDir;
     if (m_dir.IsEmpty())
     {
         char buf[200];

-       m_dir = getcwd( buf, sizeof(buf) );
+        m_dir = getcwd( buf, sizeof(buf) );

     }
     m_path = defaultDir;
     }
     m_path = defaultDir;

-    m_path += _T("/");
+    m_path += wxT("/");

     m_path += defaultFile;
     m_fileName = defaultFile;
     m_wildCard = wildCard;
     m_filterIndex = 0;
     m_path += defaultFile;
     m_fileName = defaultFile;
     m_wildCard = wildCard;
     m_filterIndex = 0;

-    
+

     // interpret wildcards
     // interpret wildcards

-    
+

     if (m_wildCard.IsEmpty())
         m_wildCard = _("All files (*)|*");
     if (m_wildCard.IsEmpty())
         m_wildCard = _("All files (*)|*");

-    
-    wxStringTokenizer tokens( m_wildCard, _T("|") );
+
+    wxStringTokenizer tokens( m_wildCard, wxT("|") );

     wxString firstWild;
     wxString firstWildText;
     if (tokens.CountTokens() == 1)
     wxString firstWild;
     wxString firstWildText;
     if (tokens.CountTokens() == 1)


@@ -588,31 +594,31 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     }
     else
     {
     }
     else
     {

-        wxASSERT_MSG( tokens.CountTokens() % 2 == 0, _T("Wrong file type descripition") );
+        wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") );

         firstWildText = tokens.GetNextToken();
         firstWild = tokens.GetNextToken();
     }
 
     // layout
         firstWildText = tokens.GetNextToken();
         firstWild = tokens.GetNextToken();
     }
 
     // layout

-    
+

     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );

-    
+

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

-    
+

     wxBitmapButton *but;
     wxBitmapButton *but;

-    
+

     but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
     but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );

-    
+

     but = new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
     but = new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );

-    
+

     buttonsizer->Add( 30, 5, 1 );
 
     but = new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );
     buttonsizer->Add( 30, 5, 1 );
 
     but = new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );


@@ -620,33 +626,33 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     but->SetToolTip( _("Go to parent directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
     but->SetToolTip( _("Go to parent directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );

-    
+

     but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5);
     but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5);

-    
+

     buttonsizer->Add( 20, 20 );
     buttonsizer->Add( 20, 20 );

-    
+

     but = new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Create new directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
     but = new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Create new directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );

-    
+

     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );

-    
+

     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 

-    m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, wxSize(440,180), 
+    m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, wxSize(440,180),

       wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
       wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );

-    
+

     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
     m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
     textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
     m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
     textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );


@@ -658,7 +664,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );
     choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );

-    
+

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


@@ -670,17 +676,17 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     SetAutoLayout( TRUE );
     SetSizer( mainsizer );
 
     SetAutoLayout( TRUE );
     SetSizer( mainsizer );

-    
+

     mainsizer->Fit( this );
     mainsizer->SetSizeHints( this );
     mainsizer->Fit( this );
     mainsizer->SetSizeHints( this );

-    
+

     Centre( wxBOTH );
 
     if (m_fileName.IsEmpty())
         m_list->SetFocus();
     else
         m_text->SetFocus();
     Centre( wxBOTH );
 
     if (m_fileName.IsEmpty())
         m_list->SetFocus();
     else
         m_text->SetFocus();

-    
+

     wxEndBusyCursor();
 }
 
     wxEndBusyCursor();
 }
 


@@ -694,11 +700,9 @@ void wxFileDialog::OnChoice( wxCommandEvent &event )
     m_list->SetWild( *str );
 }
 
     m_list->SetWild( *str );
 }
 

-void wxFileDialog::OnActivated( wxListEvent &WXUNUSED(event) )
+void wxFileDialog::OnActivated( wxListEvent &event )

 {
 {

-    wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    cevent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( cevent );
+    HandleAction( event.m_item.m_text );

 }
 
 void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )


@@ -710,76 +714,82 @@ void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
 
 void wxFileDialog::OnSelected( wxListEvent &event )
 {
 
 void wxFileDialog::OnSelected( wxListEvent &event )
 {

-    if (FindFocus() == m_list)
-        m_text->SetValue( event.m_item.m_text );
+    if (FindFocus() != m_list) return;
+    
+    wxString filename( event.m_item.m_text );
+    if (filename == wxT("..")) return;
+    
+    wxString dir;
+    m_list->GetDir( dir );
+    if (dir != wxT("/")) dir += wxT("/");
+    dir += filename;
+    if (wxDirExists(dir)) return;
+    
+    m_text->SetValue( filename );

 }
 
 }
 

-void wxFileDialog::OnListOk( wxCommandEvent &event )
+void wxFileDialog::HandleAction( const wxString &fn )

 {
 {

-    wxString filename( m_text->GetValue() );
+    wxString filename( fn );

     wxString dir;
     m_list->GetDir( dir );
     if (filename.IsEmpty()) return;
     wxString dir;
     m_list->GetDir( dir );
     if (filename.IsEmpty()) return;

-    if (filename == _T(".")) return;
-    
-    if (filename == _T(".."))
+    if (filename == wxT(".")) return;
+
+    if (filename == wxT(".."))

     {
         m_list->GoToParentDir();
         m_list->SetFocus();
         m_list->GetDir( dir );
         m_static->SetLabel( dir );
     {
         m_list->GoToParentDir();
         m_list->SetFocus();
         m_list->GetDir( dir );
         m_static->SetLabel( dir );

-       return;
+        return;

     }
 
     }
 

-    if (filename == _T("~"))
+    if (filename == wxT("~"))

     {
         m_list->GoToHomeDir();
         m_list->SetFocus();
         m_list->GetDir( dir );
         m_static->SetLabel( dir );
     {
         m_list->GoToHomeDir();
         m_list->SetFocus();
         m_list->GetDir( dir );
         m_static->SetLabel( dir );

-       return;
+        return;

     }
     }

-    
-    if (filename[0] == _T('~'))
+
+    if (filename[0] == wxT('~'))

     {
         filename.Remove( 0, 1 );
     {
         filename.Remove( 0, 1 );

-       wxString tmp( wxGetUserHome() );
-       tmp += _T('/');
-       tmp += filename;
-       filename = tmp;
+        wxString tmp( wxGetUserHome() );
+        tmp += wxT('/');
+        tmp += filename;
+        filename = tmp;

     }
 
     }
 

-    if ((filename.Find(_T('*')) != wxNOT_FOUND) ||
-        (filename.Find(_T('?')) != wxNOT_FOUND))
+    if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
+        (filename.Find(wxT('?')) != wxNOT_FOUND))

     {
     {

-        if (filename.Find(_T('/')) != wxNOT_FOUND)
-       {
-            wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );  
-           return;
-       }
-       m_list->SetWild( filename );
-       return;
+        if (filename.Find(wxT('/')) != wxNOT_FOUND)
+        {
+            wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
+            return;
+        }
+        m_list->SetWild( filename );
+        return;

     }
 
     }
 

-    if (dir != _T("/")) dir += _T("/");
-    if (filename[0] != _T('/'))
+    if (dir != wxT("/")) dir += wxT("/");
+    if (filename[0] != wxT('/'))

     {
         dir += filename;
         filename = dir;
     }
     {
         dir += filename;
         filename = dir;
     }

-    
+

     if (wxDirExists(filename))
     {
         m_list->GoToDir( filename );
     if (wxDirExists(filename))
     {
         m_list->GoToDir( filename );

-       if (filename == _T("/"))
-           m_text->SetValue( _T("") );
-       else
-           m_text->SetValue( _T("..") );

         m_list->GetDir( dir );
         m_static->SetLabel( dir );
         m_list->GetDir( dir );
         m_static->SetLabel( dir );

-       return;
+        return;

     }
     }

-    
+

     if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
     {
         if (wxFileExists( filename ))
     if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
     {
         if (wxFileExists( filename ))


@@ -802,7 +812,14 @@ void wxFileDialog::OnListOk( wxCommandEvent &event )
     }
 
     SetPath( filename );
     }
 
     SetPath( filename );

-    event.Skip();
+    
+    wxCommandEvent event;
+    wxDialog::OnOK(event);
+}
+
+void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
+{
+    HandleAction( m_text->GetValue() );

 }
 
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )


@@ -848,14 +865,14 @@ void wxFileDialog::SetPath( const wxString& path )
     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);

-       if (!ext.IsEmpty())
-       {
-           m_fileName += _T(".");
+        if (!ext.IsEmpty())
+        {
+            m_fileName += wxT(".");

             m_fileName += ext;
             m_fileName += ext;

-       }
+        }

     }
 }
     }
 }

-    
+

 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------


@@ -864,14 +881,14 @@ wxString
 wxFileSelectorEx(const wxChar *message,
                  const wxChar *default_path,
                  const wxChar *default_filename,
 wxFileSelectorEx(const wxChar *message,
                  const wxChar *default_path,
                  const wxChar *default_filename,

-                 int *indexDefaultExtension,
+                 int *WXUNUSED(indexDefaultExtension),

                  const wxChar *wildcard,
                  int flags,
                  wxWindow *parent,
                  int x, int y)
 {
     // TODO: implement this somehow
                  const wxChar *wildcard,
                  int flags,
                  wxWindow *parent,
                  int x, int y)
 {
     // TODO: implement this somehow

-    return wxFileSelector(message, default_path, default_filename, _T(""),
+    return wxFileSelector(message, default_path, default_filename, wxT(""),

                           wildcard, flags, parent, x, y);
 }
 
                           wildcard, flags, parent, x, y);
 }
 


@@ -882,7 +899,7 @@ wxString wxFileSelector( const wxChar *title,
 {
     wxString filter2;
     if ( defaultExtension && !filter )
 {
     wxString filter2;
     if ( defaultExtension && !filter )

-        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
+        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;

     else if ( filter )
         filter2 = filter;
 
     else if ( filter )
         filter2 = filter;
 


@@ -914,9 +931,9 @@ wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const
     wxString str = _("Load %s file");
     wxSprintf(prompt, str, what);
 
     wxString str = _("Load %s file");
     wxSprintf(prompt, str, what);
 

-    if (*ext == _T('.')) ext++;
+    if (*ext == wxT('.')) ext++;

     wxChar wild[60];
     wxChar wild[60];

-    wxSprintf(wild, _T("*.%s"), ext);
+    wxSprintf(wild, wxT("*.%s"), ext);

 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }
 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }


@@ -930,9 +947,9 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w
     wxString str = _("Save %s file");
     wxSprintf(prompt, str, what);
 
     wxString str = _("Save %s file");
     wxSprintf(prompt, str, what);
 

-    if (*ext == _T('.')) ext++;
+    if (*ext == wxT('.')) ext++;

     wxChar wild[60];
     wxChar wild[60];

-    wxSprintf(wild, _T("*.%s"), ext);
+    wxSprintf(wild, wxT("*.%s"), ext);

 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }
 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }