rtti api mods added

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 3e526cd611d42da36ddd04db0f3667ae4d7048de..41dc1131eda73cd89724083b23ea004230dc9787 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -180,7 +180,7 @@ void wxFileData::ReadData()
 
 #if defined(__DOS__) || defined(__WINDOWS__)
     // c:\.. is a drive don't stat it
 
 #if defined(__DOS__) || defined(__WINDOWS__)
     // c:\.. is a drive don't stat it

-    if ((fileName == wxT("..")) && (filePath.length() <= 5))
+    if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))

     {
         m_type = is_drive;
         m_size = 0;
     {
         m_type = is_drive;
         m_size = 0;


@@ -225,7 +225,7 @@ void wxFileData::ReadData()
                          buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
                          buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
 #elif defined(__WIN32__)
                          buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
                          buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
 #elif defined(__WIN32__)

-    DWORD attribs = GetFileAttributes(filePath);
+    DWORD attribs = GetFileAttributes(m_filePath);

     if (attribs != (DWORD)-1)
     {
         m_permissions.Printf(_T("%c%c%c%c"),
     if (attribs != (DWORD)-1)
     {
         m_permissions.Printf(_T("%c%c%c%c"),


@@ -871,8 +871,10 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
     // interpret wildcards
     wxArrayString wildDescriptions, wildFilters;
 
     // interpret wildcards
     wxArrayString wildDescriptions, wildFilters;

-    int wild_count = ParseWildcard(m_wildCard, wildDescriptions, wildFilters);
-    wxASSERT_MSG(wild_count > 0, wxT("Wrong file type descripition") );
+    if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) )
+    {
+        wxFAIL_MSG( wxT("Wrong file type description") );
+    }

 
     // layout
 
 
     // layout