From 0adddf99dc2d79df2e5592f3947edbdd1b665b8e Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Mon, 24 May 2010 21:57:39 +0000 Subject: [PATCH] Fix bad offset of brush on startup (recent bug). Files in file selector are now sorted case-insensitive on Windows. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1487 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/filesel.c | 11 ++++++++++- src/main.c | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/filesel.c b/src/filesel.c index 738bd94c..12c489d7 100644 --- a/src/filesel.c +++ b/src/filesel.c @@ -473,6 +473,15 @@ void Read_list_of_drives(T_Fileselector *list) Recount_files(list); } +// Comparison of file names: +#ifdef WIN32 +// case-insensitive + #define FILENAME_COMPARE strcasecmp +#else +// case-sensitive + #define FILENAME_COMPARE strcmp +#endif + // -- Tri de la liste des fichiers et répertoires --------------------------- void Sort_list_of_files(T_Fileselector *list) @@ -514,7 +523,7 @@ void Sort_list_of_files(T_Fileselector *list) // Si les deux éléments sont de même type et que le nom du suivant // est plus petit que celui du courant -> need_swap else if ( (current_item->Type==next_item->Type) && - (strcmp(current_item->Full_name,next_item->Full_name)>0) ) + (FILENAME_COMPARE(current_item->Full_name,next_item->Full_name)>0) ) need_swap=1; diff --git a/src/main.c b/src/main.c index b0910d7c..89152178 100644 --- a/src/main.c +++ b/src/main.c @@ -643,6 +643,8 @@ int Init_program(int argc,char * argv[]) *Paintbrush_sprite=1; Paintbrush_width=1; Paintbrush_height=1; + Paintbrush_offset_X=0; + Paintbrush_offset_Y=0; Paintbrush_shape=PAINTBRUSH_SHAPE_ROUND; // Charger la configuration des touches