blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index ed3ad90ffef1a4a404055dcaa4a3058931aea879..7df3852fe2a11d39f295a3f5426e6e887d883045 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -27,6 +27,7 @@
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"

+#include "wx/textctrl.h"

 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/cmndata.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/cmndata.h"


@@ -67,8 +68,8 @@
 
 #endif // __WXPM__
 
 
 #endif // __WXPM__
 

-#if defined(__WXMAC__) && !defined(__UNIX__)
-#include "moreextr.h"
+#if defined(__WXMAC__)
+#  include "MoreFilesExtras.h"

 #endif
 
 #ifdef __BORLANDC__
 #endif
 
 #ifdef __BORLANDC__


@@ -537,7 +538,7 @@ void wxGenericDirCtrl::SetupSections()
 {
 #if defined(__WXMSW__) || defined(__WXPM__)
 
 {
 #if defined(__WXMSW__) || defined(__WXPM__)
 

-#ifdef __WIN32__
+# ifdef __WIN32__

     wxChar driveBuffer[256];
     size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
     size_t i = 0;
     wxChar driveBuffer[256];
     size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
     size_t i = 0;


@@ -579,7 +580,7 @@ void wxGenericDirCtrl::SetupSections()
         if (driveBuffer[i] == wxT('\0'))
             break;
     }
         if (driveBuffer[i] == wxT('\0'))
             break;
     }

-#else
+# else

     int drive;
     int currentDrive;
 
     int drive;
     int currentDrive;
 


@@ -596,8 +597,8 @@ void wxGenericDirCtrl::SetupSections()
             AddSection(path, name);
         }
     }
             AddSection(path, name);
         }
     }

-#endif
-#elif defined(__WXMAC__) && !defined(__UNIX__)
+# endif
+#elif defined(__WXMAC__)

     FSSpec volume ;
     short index = 1 ;
     while(1) {
     FSSpec volume ;
     short index = 1 ;
     while(1) {


@@ -606,7 +607,7 @@ void wxGenericDirCtrl::SetupSections()
         break ;
 
       wxString name = wxMacFSSpec2MacFilename( &volume ) ;
         break ;
 
       wxString name = wxMacFSSpec2MacFilename( &volume ) ;

-      AddSection(name+":", name, 0);
+      AddSection(name + wxFILE_SEP_PATH, name, 0);

     }
 #else
   AddSection(wxT("/"), _("The Computer"), 0);
     }
 #else
   AddSection(wxT("/"), _("The Computer"), 0);