[Cmake-commits] [cmake-commits] hoffman committed CMakeSetup.rc 1.37 1.38 CMakeSetupDialog.cpp 1.124 1.125 CMakeSetupDialog.h 1.30 1.31 resource.h 1.21 1.22
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Mar 11 22:51:58 EDT 2008
Update of /cvsroot/CMake/CMake/Source/MFCDialog
In directory public:/mounts/ram/cvs-serv27938/Source/MFCDialog
Modified Files:
CMakeSetup.rc CMakeSetupDialog.cpp CMakeSetupDialog.h
resource.h
Log Message:
ENH: add ability to suppress dev warnings to gui code
Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/CMakeSetupDialog.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** CMakeSetupDialog.h 28 Mar 2005 18:20:55 -0000 1.30
--- CMakeSetupDialog.h 12 Mar 2008 02:51:56 -0000 1.31
***************
*** 64,67 ****
--- 64,68 ----
enum { IDD = IDD_CMakeSetupDialog_DIALOG };
CButton m_AdvancedValuesControl;
+ CButton m_SuppressDevWarningsControl;
CButton m_BrowseSource;
CButton m_BrowseBuild;
***************
*** 81,84 ****
--- 82,86 ----
CButton m_Configure;
BOOL m_AdvancedValues;
+ BOOL m_SuppressDevValue;
//}}AFX_DATA
***************
*** 126,129 ****
--- 128,133 ----
afx_msg void OnAdvancedValues();
afx_msg void OnDoubleclickedAdvancedValues();
+ afx_msg void OnSuppressDevValue();
+ afx_msg void OnDoubleclickedSuppressDevValue();
afx_msg void OnDropFiles(HDROP);
afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
Index: CMakeSetup.rc
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/CMakeSetup.rc,v
retrieving revision 1.37
retrieving revision 1.38
diff -C 2 -d -r1.37 -r1.38
*** CMakeSetup.rc 12 Mar 2007 17:30:36 -0000 1.37
--- CMakeSetup.rc 12 Mar 2008 02:51:56 -0000 1.38
***************
*** 84,115 ****
IDD_CMakeSetupDialog_DIALOG DIALOGEX 0, 0, 447, 255
! STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE |
! WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW
CAPTION "CMakeSetupDialog"
BEGIN
RTEXT "Where is the source code:",IDC_STATIC,6,7,86,9
! COMBOBOX IDC_WhereSource,96,6,169,12,CBS_SIMPLE | CBS_AUTOHSCROLL |
! WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Browse...",IDC_BROWSE_SOURCE,267,6,34,13
RTEXT "Where to build the binaries:",IDC_STATIC,5,27,90,9
! COMBOBOX IDC_WhereBuild,96,26,169,68,CBS_DROPDOWN |
! CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Browse...",IDC_BROWSE_BUILD,267,25,34,13
! CONTROL "Show Advanced Values",IDC_AdvancedValues,"Button",
! BS_AUTOCHECKBOX | WS_TABSTOP,321,18,98,9
DEFPUSHBUTTON "Configure",IDC_BuildProjects,84,221,51,15
PUSHBUTTON "OK",IDC_OK,141,221,51,15
PUSHBUTTON "Cancel",IDCANCEL,198,221,51,15
PUSHBUTTON "Help",IDC_HELP_BUTTON,312,221,51,15
! LISTBOX IDC_LIST2,15,53,419,126,LBS_SORT | LBS_OWNERDRAWVARIABLE |
! LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
! WS_HSCROLL
GROUPBOX "Cache Values",IDC_FRAME,10,44,432,140
! CTEXT "Right click on a cache value for additional options (delete, ignore, and help).\nPress Configure to update and display new values in red.\nPress OK to generate selected build files and exit.",
! IDC_MouseHelpCaption,0,191,442,27
! LTEXT "Static",IDC_PROGRESS,2,240,442,12,SS_CENTERIMAGE |
! SS_SUNKEN
PUSHBUTTON "Delete Cache",IDC_DELETE_BUTTON,255,221,51,15
END
--- 84,109 ----
IDD_CMakeSetupDialog_DIALOG DIALOGEX 0, 0, 447, 255
! STYLE DS_SETFONT | 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, 0x0
BEGIN
RTEXT "Where is the source code:",IDC_STATIC,6,7,86,9
! COMBOBOX IDC_WhereSource,96,6,169,12,CBS_SIMPLE | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Browse...",IDC_BROWSE_SOURCE,267,6,34,13
RTEXT "Where to build the binaries:",IDC_STATIC,5,27,90,9
! COMBOBOX IDC_WhereBuild,96,26,169,68,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Browse...",IDC_BROWSE_BUILD,267,25,34,13
! CONTROL "Show Advanced Values",IDC_AdvancedValues,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,321,9,98,9
DEFPUSHBUTTON "Configure",IDC_BuildProjects,84,221,51,15
PUSHBUTTON "OK",IDC_OK,141,221,51,15
PUSHBUTTON "Cancel",IDCANCEL,198,221,51,15
PUSHBUTTON "Help",IDC_HELP_BUTTON,312,221,51,15
! LISTBOX IDC_LIST2,15,53,419,126,LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
GROUPBOX "Cache Values",IDC_FRAME,10,44,432,140
! CTEXT "Right click on a cache value for additional options (delete, ignore, and help).\nPress Configure to update and display new values in red.\nPress OK to generate selected build files and exit.",IDC_MouseHelpCaption,0,191,442,27
! LTEXT "Static",IDC_PROGRESS,2,240,442,12,SS_CENTERIMAGE | SS_SUNKEN
PUSHBUTTON "Delete Cache",IDC_DELETE_BUTTON,255,221,51,15
+ CONTROL "Suppress dev Warnings",IDC_SUPPRESS_DEV_WARNINGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,321,28,108,10
END
***************
*** 119,129 ****
BEGIN
DEFPUSHBUTTON "OK",IDOK,155,159,50,14
! EDITTEXT IDC_EDIT1,7,7,351,152,ES_MULTILINE | ES_READONLY | NOT
! WS_BORDER
END
IDD_GEN_DIALOG DIALOGEX 0, 0, 263, 86
! STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
! WS_SYSMENU
CAPTION "Select Generator"
BEGIN
--- 113,121 ----
BEGIN
DEFPUSHBUTTON "OK",IDOK,155,159,50,14
! EDITTEXT IDC_EDIT1,7,7,351,152,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
END
IDD_GEN_DIALOG DIALOGEX 0, 0, 263, 86
! STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select Generator"
BEGIN
***************
*** 131,138 ****
PUSHBUTTON "Cancel",IDCANCEL,143,65,50,14
RTEXT "Build For:",IDC_BuildForLabel,7,45,34,11,SS_CENTERIMAGE
! COMBOBOX IDC_Generator,52,45,204,117,CBS_DROPDOWN | CBS_SORT |
! WS_VSCROLL | WS_TABSTOP
! CTEXT "Please select what build system you want CMake to generate files for.\nYou should select the tool that you will use to build the project.\nPress OK once you have made your selection.",
! IDC_MouseHelpCaption,7,7,245,36
END
--- 123,128 ----
PUSHBUTTON "Cancel",IDCANCEL,143,65,50,14
RTEXT "Build For:",IDC_BuildForLabel,7,45,34,11,SS_CENTERIMAGE
! COMBOBOX IDC_Generator,52,45,204,117,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
! CTEXT "Please select what build system you want CMake to generate files for.\nYou should select the tool that you will use to build the project.\nPress OK once you have made your selection.",IDC_MouseHelpCaption,7,7,245,36
END
Index: resource.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/resource.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** resource.h 28 Mar 2005 18:20:55 -0000 1.21
--- resource.h 12 Mar 2008 02:51:56 -0000 1.22
***************
*** 34,37 ****
--- 34,39 ----
#define IDC_PROGRESS 1028
#define IDC_BuildForLabel 1029
+ #define IDC_CHECK1 1030
+ #define IDC_SUPPRESS_DEV_WARNINGS 1030
// Next default values for new objects
***************
*** 41,45 ****
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
! #define _APS_NEXT_CONTROL_VALUE 1030
#define _APS_NEXT_SYMED_VALUE 102
#endif
--- 43,47 ----
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 32771
! #define _APS_NEXT_CONTROL_VALUE 1031
#define _APS_NEXT_SYMED_VALUE 102
#endif
Index: CMakeSetupDialog.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/CMakeSetupDialog.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -C 2 -d -r1.124 -r1.125
*** CMakeSetupDialog.cpp 12 Feb 2008 14:49:42 -0000 1.124
--- CMakeSetupDialog.cpp 12 Mar 2008 02:51:56 -0000 1.125
***************
*** 225,228 ****
--- 225,230 ----
//{{AFX_DATA_MAP(CMakeSetupDialog)
DDX_Control(pDX, IDC_AdvancedValues, m_AdvancedValuesControl);
+ DDX_Control(pDX, IDC_SUPPRESS_DEV_WARNINGS, m_SuppressDevWarningsControl);
+ DDX_Check(pDX, IDC_SUPPRESS_DEV_WARNINGS, m_SuppressDevValue);
DDX_Control(pDX, IDC_BROWSE_SOURCE, m_BrowseSource);
DDX_Control(pDX, IDC_BROWSE_BUILD, m_BrowseBuild);
***************
*** 262,265 ****
--- 264,269 ----
ON_BN_CLICKED(IDC_HELP_BUTTON, OnHelpButton)
ON_BN_CLICKED(IDC_AdvancedValues, OnAdvancedValues)
+ ON_BN_CLICKED(IDC_SUPPRESS_DEV_WARNINGS, OnSuppressDevValue)
+ ON_BN_DOUBLECLICKED(IDC_SUPPRESS_DEV_WARNINGS, OnDoubleclickedSuppressDevValue)
ON_BN_DOUBLECLICKED(IDC_AdvancedValues, OnDoubleclickedAdvancedValues)
ON_WM_DROPFILES()
***************
*** 672,675 ****
--- 676,680 ----
m_CMakeInstance->SetCMakeCommand(m_PathToExecutable);
m_CMakeInstance->LoadCache();
+ m_CMakeInstance->SetSuppressDevWarnings(m_SuppressDevValue);
if(m_CMakeInstance->Configure() != 0)
{
***************
*** 1074,1077 ****
--- 1079,1089 ----
SWP_NOCOPYBITS |
SWP_NOSIZE | SWP_NOZORDER);
+ m_SuppressDevWarningsControl.GetWindowRect(&cRect);
+ this->ScreenToClient(&cRect);
+ m_SuppressDevWarningsControl.SetWindowPos(&wndTop, cRect.left + deltax,
+ cRect.top,
+ 0, 0,
+ SWP_NOCOPYBITS |
+ SWP_NOSIZE | SWP_NOZORDER);
m_BrowseSource.GetWindowRect(&cRect);
this->ScreenToClient(&cRect);
***************
*** 1384,1387 ****
--- 1396,1408 ----
+ void CMakeSetupDialog::OnSuppressDevValue()
+ {
+ }
+
+ void CMakeSetupDialog::OnDoubleclickedSuppressDevValue()
+ {
+ this->OnSuppressDevValue();
+ }
+
void CMakeSetupDialog::OnAdvancedValues()
{
More information about the Cmake-commits
mailing list