Applied patch [ 642157 ] [MSW] HMENU resource leak from wxMenuBar

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 19570dec8832c0588a68e9d34d6d5df5c04646aa..c542229e50cb79a75d140065a231155931a1e435 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #pragma implementation "filedlgg.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "filedlgg.h"
 #endif


@@ -70,6 +78,23 @@
 #include <time.h>
 #include <unistd.h>
 
 #include <time.h>
 #include <unistd.h>
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the list ctrl fields in report view
+enum FileListField
+{
+    FileList_Name,
+    FileList_Type,
+    FileList_Date,
+    FileList_Time,
+#ifdef __UNIX__
+    FileList_Perm,
+#endif // __UNIX__
+    FileList_Max
+};
+

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


@@ -81,11 +106,13 @@ public:
     wxString GetName() const;
     wxString GetFullName() const;
     wxString GetHint() const;
     wxString GetName() const;
     wxString GetFullName() const;
     wxString GetHint() const;

-    wxString GetEntry( int num );
-    bool IsDir();
-    bool IsLink();
-    bool IsExe();
-    long GetSize();
+    wxString GetEntry( FileListField num ) const;
+
+    bool IsDir() const { return m_isDir; }
+    bool IsLink() const { return m_isLink; }
+    bool IsExe() const { return m_isExe; }
+    long GetSize() const { return m_size; }
+

     void MakeItem( wxListItem &item );
     void SetNewName( const wxString &name, const wxString &fname );
 
     void MakeItem( wxListItem &item );
     void SetNewName( const wxString &name, const wxString &fname );
 


@@ -113,9 +140,10 @@ class wxFileCtrl : public wxListCtrl
 public:
     wxFileCtrl();
     wxFileCtrl( wxWindow *win,
 public:
     wxFileCtrl();
     wxFileCtrl( wxWindow *win,

+                wxStaticText *labelDir,

                 wxWindowID id,
                 wxWindowID id,

-                const wxString &dirName,

                 const wxString &wild,
                 const wxString &wild,

+                bool showHidden,

                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_LIST,
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_LIST,


@@ -156,6 +184,9 @@ private:
     wxWindow     *m_goToParentControl;
     wxWindow     *m_newDirControl;
 
     wxWindow     *m_goToParentControl;
     wxWindow     *m_newDirControl;
 

+    // the label showing the current directory
+    wxStaticText *m_labelDir;
+

     DECLARE_DYNAMIC_CLASS(wxFileCtrl);
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxFileCtrl);
     DECLARE_EVENT_TABLE()
 };


@@ -409,8 +440,8 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     }
 #endif
 
     }
 #endif
 

-    struct stat buff;
-    wxStat( m_fileName.fn_str(), &buff );
+    wxStructStat buff;
+    wxStat( m_fileName, &buff );

 
 #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
     struct stat lbuff;
 
 #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
     struct stat lbuff;


@@ -437,10 +468,21 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     m_year = t->tm_year;
     m_year += 1900;
 
     m_year = t->tm_year;
     m_year += 1900;
 

-    m_permissions.sprintf( wxT("%c%c%c"),
-     ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),
-     ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')),
-     ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) );
+    char buffer[10];
+    sprintf( buffer, "%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' : '-') );
+#if wxUSE_UNICODE
+    m_permissions = wxConvUTF8.cMB2WC( buffer );
+#else
+    m_permissions = buffer;
+#endif
+
+//    m_permissions.sprintf( wxT("%c%c%c"),
+//     ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),
+//     ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')),
+//     ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) );

 }
 
 wxString wxFileData::GetName() const
 }
 
 wxString wxFileData::GetName() const


@@ -456,13 +498,13 @@ wxString wxFileData::GetFullName() const
 wxString wxFileData::GetHint() const
 {
     wxString s = m_fileName;
 wxString wxFileData::GetHint() const
 {
     wxString s = m_fileName;

-    s += "  ";
-    if (m_isDir) s += _("<DIR> ");
-    else if (m_isLink) s += _("<LINK> ");
+    s += wxT("  ");
+    if (m_isDir) s += wxT("<DIR> ");
+    else if (m_isLink) s += wxT("<LINK> ");

     else
     {
         s += LongToString( m_size );
     else
     {
         s += LongToString( m_size );

-        s += _(" bytes ");
+        s += wxT(" bytes ");

     }
     s += IntToString( m_day );
     s += wxT(".");
     }
     s += IntToString( m_day );
     s += wxT(".");


@@ -478,71 +520,43 @@ wxString wxFileData::GetHint() const
     return s;
 };
 
     return s;
 };
 

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

 {
     wxString s;
 {
     wxString s;

-    switch (num)
+    switch ( num )

     {
     {

-        case 0:
-        {
+        case FileList_Name:

             s = m_name;
             s = m_name;

-        }
-        break;
-        case 1:
-        {
-            if (m_isDir) s = _("<DIR>");
-            else if (m_isLink) s = _("<LINK>");
-            else s = LongToString( m_size );
-        }
-        break;
-        case 2:
-        {
-            if (m_day < 10) s = wxT("0"); else s = wxT("");
-            s += IntToString( m_day );
-            s += wxT(".");
-            if (m_month < 10) s += wxT("0");
-            s += IntToString( m_month );
-            s += wxT(".");
-            s += IntToString( m_year );
-        }
-        break;
-        case 3:
-        {
-            if (m_hour < 10) s = wxT("0"); else s = wxT("");
-            s += IntToString( m_hour );
-            s += wxT(":");
-            if (m_minute < 10) s += wxT("0");
-            s += IntToString( m_minute );

             break;
             break;

-        }
-        case 4:
-            s = m_permissions;
+
+        case FileList_Type:
+            if (m_isDir)
+                s = _("<DIR>");
+            else if (m_isLink)
+                s = _("<LINK>");
+            else
+                s.Printf(_T("%ld"), m_size);

             break;
             break;

-        default:
-            s = wxT("No entry");
+
+        case FileList_Date:
+            s.Printf(_T("%02d.%02d.%d"), m_day, m_month, m_year);

             break;
             break;

-    }
-    return s;
-}

 
 

-bool wxFileData::IsDir()
-{
-    return m_isDir;
-}
+        case FileList_Time:
+            s.Printf(_T("%02d:%02d"), m_hour, m_minute);
+            break;

 
 

-bool wxFileData::IsExe()
-{
-    return m_isExe;
-}
+#ifdef __UNIX__
+        case FileList_Perm:
+            s = m_permissions;
+            break;
+#endif // __UNIX__

 
 

-bool wxFileData::IsLink()
-{
-    return m_isLink;
-}
+        default:
+            wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") );
+    }

 
 

-long wxFileData::GetSize()
-{
-    return m_size;
+    return s;

 }
 
 void wxFileData::SetNewName( const wxString &name, const wxString &fname )
 }
 
 void wxFileData::SetNewName( const wxString &name, const wxString &fname )


@@ -555,8 +569,10 @@ void wxFileData::MakeItem( wxListItem &item )
 {
     item.m_text = m_name;
     item.ClearAttributes();
 {
     item.m_text = m_name;
     item.ClearAttributes();

-    if (IsExe()) item.SetTextColour(*wxRED);
-    if (IsDir()) item.SetTextColour(*wxBLUE);
+    if (IsExe())
+        item.SetTextColour(*wxRED);
+    if (IsDir())
+        item.SetTextColour(*wxBLUE);

 
     if (IsDir())
         item.m_image = FI_FOLDER;
 
     if (IsDir())
         item.m_image = FI_FOLDER;


@@ -569,7 +585,7 @@ void wxFileData::MakeItem( wxListItem &item )
 
     if (IsLink())
     {
 
     if (IsLink())
     {

-        wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
+        wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") );

         item.SetTextColour(*dg);
     }
     item.m_data = (long)this;
         item.SetTextColour(*dg);
     }
     item.m_data = (long)this;


@@ -589,20 +605,21 @@ END_EVENT_TABLE()
 
 wxFileCtrl::wxFileCtrl()
 {
 
 wxFileCtrl::wxFileCtrl()
 {

-#if defined(__UNIX__)
-    m_dirName = wxT("/");
-#elif defined(__DOS__)
-    m_dirName = wxT("");
-#endif

     m_showHidden = FALSE;
 }
 
     m_showHidden = FALSE;
 }
 

-wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
-                       const wxString &dirName, const wxString &wild,
-                       const wxPoint &pos, const wxSize &size,
-                       long style, const wxValidator &validator,
+wxFileCtrl::wxFileCtrl(wxWindow *win,
+                       wxStaticText *labelDir,
+                       wxWindowID id,
+                       const wxString& wild,
+                       bool showHidden,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator &validator,

                        const wxString &name)
                        const wxString &name)

-        : wxListCtrl(win, id, pos, size, style, validator, name)
+          : wxListCtrl(win, id, pos, size, style, validator, name),
+            m_wild(wild)

 {
     if (! g_IconsTable)
         g_IconsTable = new wxFileIconsTable;
 {
     if (! g_IconsTable)
         g_IconsTable = new wxFileIconsTable;


@@ -610,12 +627,12 @@ wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
 
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
 
 
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
 

-    m_goToParentControl = m_newDirControl = NULL;
+    m_goToParentControl =
+    m_newDirControl = NULL;

 
 

-    m_dirName = dirName;
-    m_wild = wild;
-    m_showHidden = FALSE;
-    UpdateFiles();
+    m_labelDir = labelDir;
+
+    m_showHidden = showHidden;

 }
 
 void wxFileCtrl::ChangeToListMode()
 }
 
 void wxFileCtrl::ChangeToListMode()


@@ -650,14 +667,9 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
     long my_style = GetWindowStyleFlag();
     if (my_style & wxLC_REPORT)
     {
     long my_style = GetWindowStyleFlag();
     if (my_style & wxLC_REPORT)
     {

-#ifdef __UNIX__
-        const int noEntries = 5;
-#else
-        const int noEntries = 4;
-#endif

         ret = InsertItem( item );
         ret = InsertItem( item );

-        for (int i = 1; i < noEntries; i++)
-            SetItem( item.m_itemId, i, fd->GetEntry( i) );
+        for (int i = 1; i < FileList_Max; i++)
+            SetItem( item.m_itemId, i, fd->GetEntry((FileListField)i) );

     }
     else if (my_style & wxLC_LIST)
     {
     }
     else if (my_style & wxLC_LIST)
     {


@@ -668,6 +680,10 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 
 void wxFileCtrl::UpdateFiles()
 {
 
 void wxFileCtrl::UpdateFiles()
 {

+    // don't do anything before ShowModal() call which sets m_dirName
+    if ( m_dirName.empty() )
+        return;
+

     wxBusyCursor bcur; // this may take a while...
 
     long my_style = GetWindowStyleFlag();
     wxBusyCursor bcur; // this may take a while...
 
     long my_style = GetWindowStyleFlag();


@@ -862,6 +878,8 @@ void wxFileCtrl::GoToParentDir()
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
         }
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
         }

+
+        m_labelDir->SetLabel(m_dirName);

     }
 }
 
     }
 }
 


@@ -877,6 +895,8 @@ void wxFileCtrl::GoToDir( const wxString &dir )
     UpdateFiles();
     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     EnsureVisible( 0 );
     UpdateFiles();
     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     EnsureVisible( 0 );

+
+    m_labelDir->SetLabel(dir);

 }
 
 void wxFileCtrl::GetDir( wxString &dir )
 }
 
 void wxFileCtrl::GetDir( wxString &dir )


@@ -983,37 +1003,37 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
         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_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_CHOICE(ID_CHOICE,wxFileDialog::OnChoiceFilter)

         EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
         EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
 END_EVENT_TABLE()
 
         EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
         EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
 END_EVENT_TABLE()
 

-long wxFileDialog::s_lastViewStyle = wxLC_LIST;
-bool wxFileDialog::s_lastShowHidden = FALSE;
+long wxFileDialog::ms_lastViewStyle = wxLC_LIST;
+bool wxFileDialog::ms_lastShowHidden = FALSE;

 
 wxFileDialog::wxFileDialog(wxWindow *parent,
 
 wxFileDialog::wxFileDialog(wxWindow *parent,

-                 const wxString& message,
-                 const wxString& defaultDir,
-                 const wxString& defaultFile,
-                 const wxString& wildCard,
-                 long style,
-                 const wxPoint& pos ) :
-  wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
+                           const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFile,
+                           const wxString& wildCard,
+                           long style,
+                           const wxPoint& pos )
+            : wxDialog( parent, -1, message, pos, wxDefaultSize,
+                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )

 {
 {

-    wxBusyCursor bcur;
-

     if (wxConfig::Get(FALSE))
     {
         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
     if (wxConfig::Get(FALSE))
     {
         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),

-                              &s_lastViewStyle);
+                              &ms_lastViewStyle);

         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),

-                              &s_lastShowHidden);
+                              &ms_lastShowHidden);

     }
 
     m_message = message;
     m_dialogStyle = style;
 
     }
 
     m_message = message;
     m_dialogStyle = style;
 

-    if (m_dialogStyle == 0) m_dialogStyle = wxOPEN;
+    if (m_dialogStyle == 0)
+        m_dialogStyle = wxOPEN;

     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
         m_dialogStyle |= wxOPEN;
 
     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
         m_dialogStyle |= wxOPEN;
 


@@ -1056,9 +1076,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     }
     if ( firstWild.Left( 2 ) == wxT("*.") )
         m_filterExtension = firstWild.Mid( 1 );
     }
     if ( firstWild.Left( 2 ) == wxT("*.") )
         m_filterExtension = firstWild.Mid( 1 );

-    if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString;
+    if ( m_filterExtension == wxT(".*") )
+        m_filterExtension = wxEmptyString;

 
     // layout
 
     // layout

+    
+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

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


@@ -1109,29 +1132,31 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 

-    if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+    if (is_pda)

         mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
     else
         mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
         mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
     else
         mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );

-    if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
+    if (is_pda)

         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 );
 
         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 );
 

-    if (m_dialogStyle & wxMULTIPLE)
-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-                                 wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER );
-    else
-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-                                 wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
-    m_list->ShowHidden(s_lastShowHidden);
+    long style2 = ms_lastViewStyle | wxSUNKEN_BORDER;
+    if ( !(m_dialogStyle & wxMULTIPLE) )
+        style2 |= wxLC_SINGLE_SEL;
+
+    m_list = new wxFileCtrl( this, m_static, ID_LIST_CTRL,
+                             firstWild, ms_lastShowHidden,
+                             wxDefaultPosition, wxSize(540,200),
+                             style2);
+

     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);
 
     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);
 

-    if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+    if (is_pda)

     {
         // PDAs have a different screen layout
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
     {
         // PDAs have a different screen layout
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );


@@ -1147,7 +1172,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );

-        m_check->SetValue( s_lastShowHidden );
+        m_check->SetValue( ms_lastShowHidden );

         textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
 
         buttonsizer = new wxBoxSizer( wxHORIZONTAL );
         textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
 
         buttonsizer = new wxBoxSizer( wxHORIZONTAL );


@@ -1169,7 +1194,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
         m_choice = new wxChoice( this, ID_CHOICE );
         choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
         m_choice = new wxChoice( this, ID_CHOICE );
         choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );

-        m_check->SetValue( s_lastShowHidden );
+        m_check->SetValue( ms_lastShowHidden );

         choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
         choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
         mainsizer->Add( choicesizer, 0, wxEXPAND );
         choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
         choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
         mainsizer->Add( choicesizer, 0, wxEXPAND );


@@ -1192,12 +1217,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     Centre( wxBOTH );
 
 
     Centre( wxBOTH );
 

-/*
-    if (m_fileName.IsEmpty())
-        m_list->SetFocus();
-    else
-*/
-        m_text->SetFocus();
+    m_text->SetFocus();

 }
 
 wxFileDialog::~wxFileDialog()
 }
 
 wxFileDialog::~wxFileDialog()


@@ -1205,30 +1225,52 @@ wxFileDialog::~wxFileDialog()
     if (wxConfig::Get(FALSE))
     {
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
     if (wxConfig::Get(FALSE))
     {
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),

-                               s_lastViewStyle);
+                               ms_lastViewStyle);

         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),

-                               s_lastShowHidden);
+                               ms_lastShowHidden);

     }
 }
 
     }
 }
 

-void wxFileDialog::OnChoice( wxCommandEvent &event )
+int wxFileDialog::ShowModal()

 {
 {

-    int index = (int)event.GetInt();
-    wxString *str = (wxString*) m_choice->GetClientData( index );
+    m_list->GoToDir(m_dir);
+    m_text->SetValue(m_fileName);
+
+    return wxDialog::ShowModal();
+}
+
+void wxFileDialog::DoSetFilterIndex(int filterindex)
+{
+    wxString *str = (wxString*) m_choice->GetClientData( filterindex );

     m_list->SetWild( *str );
     m_list->SetWild( *str );

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

     {
     {

-        m_filterExtension = str -> Mid( 1 );
-        if (m_filterExtension == ".*") m_filterExtension = wxEmptyString;
+        m_filterExtension = str->Mid(2);
+        if (m_filterExtension == _T("*"))
+            m_filterExtension.clear();

     }
     else
     }
     else

-        m_filterExtension = wxEmptyString;
+    {
+        m_filterExtension.clear();
+    }
+}
+
+void wxFileDialog::SetFilterIndex( int filterindex )
+{
+    m_choice->SetSelection( filterindex );
+
+    DoSetFilterIndex(filterindex);
+}
+
+void wxFileDialog::OnChoiceFilter( wxCommandEvent &event )
+{
+    DoSetFilterIndex((int)event.GetInt());

 }
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {
 }
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {

-    m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );
+    m_list->ShowHidden( (ms_lastShowHidden = event.GetInt() != 0) );

 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )
 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )


@@ -1270,8 +1312,6 @@ void wxFileDialog::HandleAction( const wxString &fn )
     {
         m_list->GoToParentDir();
         m_list->SetFocus();
     {
         m_list->GoToParentDir();
         m_list->SetFocus();

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

         return;
     }
 
         return;
     }
 


@@ -1280,8 +1320,6 @@ void wxFileDialog::HandleAction( const wxString &fn )
     {
         m_list->GoToHomeDir();
         m_list->SetFocus();
     {
         m_list->GoToHomeDir();
         m_list->SetFocus();

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

         return;
     }
 
         return;
     }
 


@@ -1318,42 +1356,43 @@ void wxFileDialog::HandleAction( const wxString &fn )
     if (wxDirExists(filename))
     {
         m_list->GoToDir( filename );
     if (wxDirExists(filename))
     {
         m_list->GoToDir( filename );

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

         return;
     }
 
         return;
     }
 

-
-    if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
+    // append the default extension to the filename if it doesn't have any
+    //
+    // VZ: the logic of testing for !wxFileExists() only for the open file
+    //     dialog is not entirely clear to me, why don't we allow saving to a
+    //     file without extension as well?
+    if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )

     {
     {

-        if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
-                filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
-            filename << m_filterExtension;
-        if (wxFileExists( filename ))
+        wxString ext;
+        wxSplitPath(filename, NULL, NULL, &ext);
+        if ( ext.empty() )

         {
         {

-            wxString msg;
-            msg.Printf( _("File '%s' already exists, do you really want to "
-                         "overwrite it?"), filename.c_str() );
-
-            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
-                return;
+            // append the first extension of the filter string
+            filename += m_filterExtension.BeforeFirst(_T(';'));

         }
     }
         }
     }

-    else if ( m_dialogStyle & wxOPEN )
+
+    // check that the file [doesn't] exist if necessary
+    if ( (m_dialogStyle & wxSAVE) &&
+            (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+                wxFileExists( filename ) )

     {
     {

-        if ( !wxFileExists( filename ) )
-            if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
-                  filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
-                filename << m_filterExtension;
+        wxString msg;
+        msg.Printf( _("File '%s' already exists, do you really want to "
+                     "overwrite it?"), filename.c_str() );

 
 

-        if ( m_dialogStyle & wxFILE_MUST_EXIST )
-        {
-            if ( !wxFileExists( filename ) )
-            {
-                wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR );
-                return;
-            }
-        }
+        if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            return;
+    }
+    else if ( (m_dialogStyle & wxOPEN) &&
+                (m_dialogStyle & wxFILE_MUST_EXIST) &&
+                    !wxFileExists(filename) )
+    {
+        wxMessageBox(_("Please choose an existing file."), _("Error"),
+                     wxOK | wxICON_ERROR );

     }
 
     SetPath( filename );
     }
 
     SetPath( filename );


@@ -1382,14 +1421,14 @@ void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToListMode();
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToListMode();

-    s_lastViewStyle = wxLC_LIST;
+    ms_lastViewStyle = wxLC_LIST;

     m_list->SetFocus();
 }
 
 void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToReportMode();
     m_list->SetFocus();
 }
 
 void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToReportMode();

-    s_lastViewStyle = wxLC_REPORT;
+    ms_lastViewStyle = wxLC_REPORT;

     m_list->SetFocus();
 }
 
     m_list->SetFocus();
 }
 


@@ -1397,20 +1436,12 @@ void wxFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->GoToParentDir();
     m_list->SetFocus();
 {
     m_list->GoToParentDir();
     m_list->SetFocus();

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

 }
 
 void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->GoToHomeDir();
     m_list->SetFocus();
 }
 
 void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->GoToHomeDir();
     m_list->SetFocus();

-    wxString dir;
-    m_list->GetDir( dir );
-    m_static->SetLabel( dir );
-
-    m_text->SetFocus();

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


@@ -1422,11 +1453,11 @@ void wxFileDialog::SetPath( const wxString& path )
 {
     // not only set the full path but also update filename and dir
     m_path = path;
 {
     // not only set the full path but also update filename and dir
     m_path = path;

-    if ( !!path )
+    if ( !path.empty() )

     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);

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

         {
             m_fileName += wxT(".");
             m_fileName += ext;
         {
             m_fileName += wxT(".");
             m_fileName += ext;


@@ -1602,3 +1633,4 @@ public:
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
 
 #endif // wxUSE_FILEDLG
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
 
 #endif // wxUSE_FILEDLG

+