diff --git a/4coder_string.h b/4coder_string.h index 451b7f41..e561f4e8 100644 --- a/4coder_string.h +++ b/4coder_string.h @@ -914,7 +914,7 @@ compare_ss(String a, String b){ r = (a.str[i] > b.str[i]) - (b.str[i] > a.str[i]); } else{ - r = (a.size > b.size) - (a.size < b.size); + r = (a.size > b.size) - (b.size > a.size); } return(r); diff --git a/TODO.txt b/TODO.txt index 1448931e..fec89b07 100644 --- a/TODO.txt +++ b/TODO.txt @@ -71,12 +71,12 @@ ; [X] paste snaps the cursor back into view! ; [X] clean whitespace doesn't appear to be cleaning trailing whitespace anymore??? ; [X] problem with end of line comments +; [X] paths with parens in them ; ; [] indication on failure to save ; [] history is broken, revist the entire system ; ; [] 8.0\Include\um\dsound.h (not reproduced, get more info) -; [] paths with parens in them ; [] paste external text from bug report (in email) (not reproduced, get more info) ; ; @@ -85,6 +85,7 @@ ; ; [] tokens in the custom API ; [] auto indent on the custom side +; [] expose dirty flags ; [] option to not open *messages* every startup ; [] command for resizing panels ; [] control over how mouse effects panel focus @@ -95,6 +96,9 @@ ; [] hook on exit ; [] exit command ; [] read only files +; [] break down the build system and get away from the preproc hack +; [] locking to a view for next position jumping +; [] flag in create buffer to prevent making new files ; ; TODOS diff --git a/internal_4coder_string.cpp b/internal_4coder_string.cpp index ffee550e..d42b08f0 100644 --- a/internal_4coder_string.cpp +++ b/internal_4coder_string.cpp @@ -600,7 +600,7 @@ and positive if a sorts after b alphabetically.) */{ r = (a.str[i] > b.str[i]) - (b.str[i] > a.str[i]); } else{ - r = (a.size > b.size) - (a.size < b.size); + r = (a.size > b.size) - (b.size > a.size); } return(r); diff --git a/win32_4ed.cpp b/win32_4ed.cpp index cade4b59..7fd7df5e 100644 --- a/win32_4ed.cpp +++ b/win32_4ed.cpp @@ -2041,7 +2041,7 @@ WinMain(HINSTANCE hInstance, if (win32vars.custom_api.get_alpha_4coder_version == 0 || win32vars.custom_api.get_alpha_4coder_version(MAJOR, MINOR, PATCH) == 0){ - OutputDebugStringA("Error: application and custom version numbers don't match\n"); + MessageBoxA(0,"Error: The application and custom version numbers don't match.\n", "Error",0); exit(1); } win32vars.custom_api.get_bindings = (Get_Binding_Data_Function*) @@ -2056,7 +2056,7 @@ WinMain(HINSTANCE hInstance, } if (win32vars.custom_api.get_bindings == 0){ - OutputDebugStringA("Error: 4coder_custom.dll is missing\n"); + MessageBoxA(0,"Error: The custom dll is missing.\n", "Error",0); exit(1); }