diff --git a/Source/MFCDialog/CMakeSetup.rc b/Source/MFCDialog/CMakeSetup.rc index 013194464..37f25aab0 100644 --- a/Source/MFCDialog/CMakeSetup.rc +++ b/Source/MFCDialog/CMakeSetup.rc @@ -74,9 +74,8 @@ IDR_MAINFRAME ICON "res\\CMakeSetupDialog.ico" // IDD_ABOUTBOX DIALOGEX 0, 0, 235, 55 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About CMakeSetup" -FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 LTEXT "CMakeSetup\nwww.cmake.org",IDC_STATIC,40,18,119,16 @@ -84,11 +83,10 @@ BEGIN END IDD_CMakeSetupDialog_DIALOG DIALOGEX 0, 0, 447, 255 -STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "CMakeSetupDialog" -FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Where is the source code:",IDC_STATIC,6,7,86,9 COMBOBOX IDC_WhereSource,96,6,169,12,CBS_SIMPLE | CBS_AUTOHSCROLL | @@ -116,9 +114,8 @@ BEGIN END IDD_CMAKE_HELP_DIALOG DIALOG 0, 0, 365, 183 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CMake Help" -FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,155,159,50,14 EDITTEXT IDC_EDIT1,7,7,351,152,ES_MULTILINE | ES_READONLY | NOT @@ -126,10 +123,9 @@ BEGIN END IDD_GEN_DIALOG DIALOGEX 0, 0, 263, 86 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Generator" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,70,65,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,65,50,14 diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 670fed768..3bd86376f 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -801,7 +801,7 @@ void CMakeCommandUsage(const char* program) " line\n" << " environment - display the current enviroment\n" << " make_directory dir - create a directory\n" - << " remeove file1 file2 ... - remove the file(s)\n" + << " remove file1 file2 ... - remove the file(s)\n" << " tar [cxt][vfz] file.tar file/dir1 file/dir2 ... - create a tar.\n" << " time command [args] ... - run command and return elapsed time\n" #if defined(_WIN32) && !defined(__CYGWIN__)