Compiler bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -115,7 +115,7 @@
|
|||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include "wx/msw/mslu.h"
|
#include "wx/msw/mslu.h"
|
||||||
|
|
||||||
// sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
|
// sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
|
||||||
//
|
//
|
||||||
// note that it must be included after <windows.h>
|
// note that it must be included after <windows.h>
|
||||||
@@ -922,7 +922,7 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
|
|||||||
// includes previously prepended path separator
|
// includes previously prepended path separator
|
||||||
strcat(thePath, theFileName);
|
strcat(thePath, theFileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
// create path string for return value
|
// create path string for return value
|
||||||
wxString result( thePath ) ;
|
wxString result( thePath ) ;
|
||||||
#else
|
#else
|
||||||
@@ -1396,7 +1396,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
wxString result;
|
wxString result;
|
||||||
gs_dir->GetFirst(&result, wxFileNameFromPath((wxChar) spec), dirFlags);
|
gs_dir->GetFirst(&result, wxFileNameFromPath((wxChar*) spec), dirFlags);
|
||||||
if ( result.IsEmpty() )
|
if ( result.IsEmpty() )
|
||||||
{
|
{
|
||||||
wxDELETE(gs_dir);
|
wxDELETE(gs_dir);
|
||||||
|
Reference in New Issue
Block a user