summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Woehlke <matthew.woehlke@kitware.com>2020-04-23 19:52:51 (GMT)
committerBrad King <brad.king@kitware.com>2020-04-24 13:37:01 (GMT)
commitf56a6954408343f8efe24876067b52415228aaba (patch)
tree37ad21682ad1815e5409be06945d5c829f251794
parentdf2d39bc512bd09ae808e8a2a6c7523737bb26c0 (diff)
downloadCMake-f56a6954408343f8efe24876067b52415228aaba.zip
CMake-f56a6954408343f8efe24876067b52415228aaba.tar.gz
CMake-f56a6954408343f8efe24876067b52415228aaba.tar.bz2
ccmake: Rename cmCursesColor::{Options => Choice}
Rename the internal name for the color applied to multiple-choice options to avoid use of the overloaded term 'option'.
-rw-r--r--Source/CursesDialog/cmCursesColor.cxx2
-rw-r--r--Source/CursesDialog/cmCursesColor.h2
-rw-r--r--Source/CursesDialog/cmCursesOptionsWidget.cxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/CursesDialog/cmCursesColor.cxx b/Source/CursesDialog/cmCursesColor.cxx
index 641d48c..371eaa1 100644
--- a/Source/CursesDialog/cmCursesColor.cxx
+++ b/Source/CursesDialog/cmCursesColor.cxx
@@ -23,7 +23,7 @@ void cmCursesColor::InitColors()
init_pair(cmCursesColor::BoolOn, COLOR_GREEN, -1);
init_pair(cmCursesColor::String, COLOR_BLUE, -1);
init_pair(cmCursesColor::Path, COLOR_YELLOW, -1);
- init_pair(cmCursesColor::Options, COLOR_MAGENTA, -1);
+ init_pair(cmCursesColor::Choice, COLOR_MAGENTA, -1);
}
#endif
}
diff --git a/Source/CursesDialog/cmCursesColor.h b/Source/CursesDialog/cmCursesColor.h
index 78ca52c..94d0a11 100644
--- a/Source/CursesDialog/cmCursesColor.h
+++ b/Source/CursesDialog/cmCursesColor.h
@@ -13,7 +13,7 @@ public:
BoolOn,
String,
Path,
- Options
+ Choice
};
static bool HasColors();
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx
index a15241f..8df32e2 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.cxx
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -17,8 +17,8 @@ cmCursesOptionsWidget::cmCursesOptionsWidget(int width, int height, int left,
// the widget into a string widget at some point. BOOL is safe for
// now.
if (cmCursesColor::HasColors()) {
- set_field_fore(this->Field, COLOR_PAIR(cmCursesColor::Options));
- set_field_back(this->Field, COLOR_PAIR(cmCursesColor::Options));
+ set_field_fore(this->Field, COLOR_PAIR(cmCursesColor::Choice));
+ set_field_back(this->Field, COLOR_PAIR(cmCursesColor::Choice));
} else {
set_field_fore(this->Field, A_NORMAL);
set_field_back(this->Field, A_STANDOUT);