Commit ea293f9e authored by Rafaël Carré's avatar Rafaël Carré
Browse files

frontport [17287] from branch

parent c85bee10
......@@ -122,26 +122,29 @@ static inline char *wxDnDFromLocale( const wxChar *stupid )
* UTF-8 but also Windows-1252(!) and ISO-8859-15(!) or any
* non-western encoding, it obviously fails.
*/
size_t i = 0;
while (stupid[i])
i++;
char psz_local[i + 1];
if ((i >= 1) && (stupid[i - 1] == '\n'))
i--;
wxString str(stupid);
int i;
do
size_t n = str.Len();
char psz_local[n+1];
for(i=0;i<n;i++)
psz_local[i] = stupid[i];
while (i--);
psz_local[n] = '\0';
if( psz_local[n-1] == '\n' )
psz_local[n-1] = '\0';
return FromLocaleDup( psz_local );
}
# define wxDnDLocaleFree( string ) free( string )
#else
# define wxDnDFromLocale( string ) wxFromLocale( string )
# define wxDnDLocaleFree( string ) wxLocaleFree( string )
#endif
#define wxDnDLocaleFree( string ) wxLocaleFree( string )
#define WRAPCOUNT 80
#define OPEN_NORMAL 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment