summaryrefslogtreecommitdiffstats
path: root/Source/MFCDialog
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-12-06 21:03:30 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-12-06 21:03:30 (GMT)
commitc1132e4b08da658a1eab86e212a9b205bce63337 (patch)
treee9b0213e0fc9c198c4c31f822a7c509828b8df16 /Source/MFCDialog
parentb0f4a4cb39927bf5490a5c6e3c0584ca277277c3 (diff)
downloadCMake-c1132e4b08da658a1eab86e212a9b205bce63337.zip
CMake-c1132e4b08da658a1eab86e212a9b205bce63337.tar.gz
CMake-c1132e4b08da658a1eab86e212a9b205bce63337.tar.bz2
ENH: move version to title bar
Diffstat (limited to 'Source/MFCDialog')
-rw-r--r--Source/MFCDialog/CMakeSetup.rc1
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.cpp14
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.h5
3 files changed, 5 insertions, 15 deletions
diff --git a/Source/MFCDialog/CMakeSetup.rc b/Source/MFCDialog/CMakeSetup.rc
index 5bfb0ef..7594ddc 100644
--- a/Source/MFCDialog/CMakeSetup.rc
+++ b/Source/MFCDialog/CMakeSetup.rc
@@ -106,7 +106,6 @@ BEGIN
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_CMAKE_VERSION,3,221,92,13,SS_CENTERIMAGE
PUSHBUTTON "OK",IDC_OK,166,219,51,15
COMBOBOX IDC_Generator,345,7,97,50,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index f6ca64a..240efcd 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -171,8 +171,6 @@ void CMakeSetupDialog::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CMakeSetupDialog)
- DDX_Control(pDX, IDC_CMAKE_VERSION, m_VersionDisplay);
- DDX_Control(pDX, IDC_PROGRESS, m_StatusDisplay);
DDX_Control(pDX, IDC_AdvancedValues, m_AdvancedValuesControl);
DDX_Control(pDX, IDC_BuildForLabel, m_BuildForLabel);
DDX_Control(pDX, IDC_BROWSE_SOURCE, m_BrowseSource);
@@ -188,6 +186,7 @@ void CMakeSetupDialog::DoDataExchange(CDataExchange* pDX)
DDX_Control(pDX, IDC_WhereBuild, m_WhereBuildControl);
DDX_Control(pDX, IDC_LIST2, m_CacheEntriesList);
DDX_Control(pDX, IDC_MouseHelpCaption, m_MouseHelp);
+ DDX_Control(pDX, IDC_PROGRESS, m_StatusDisplay);
DDX_Control(pDX, IDC_BuildProjects, m_Configure);
DDX_CBStringExact(pDX, IDC_Generator, m_GeneratorChoiceString);
DDX_Check(pDX, IDC_AdvancedValues, m_AdvancedValues);
@@ -288,10 +287,10 @@ BOOL CMakeSetupDialog::OnInitDialog()
// Set the version number
char tmp[1024];
- sprintf(tmp,"Version %d.%d - %s", cmake::GetMajorVersion(),
+ sprintf(tmp,"CMake %d.%d - %s", cmake::GetMajorVersion(),
cmake::GetMinorVersion(), cmake::GetReleaseVersion());
- SetDlgItemText(IDC_CMAKE_VERSION, tmp);
SetDlgItemText(IDC_PROGRESS, "");
+ this->SetWindowText(tmp);
this->UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control
}
@@ -987,13 +986,6 @@ void CMakeSetupDialog::OnSize(UINT nType, int cx, int cy)
deltax = int(deltax + m_deltaXRemainder);
m_deltaXRemainder = float(deltax%2);
- m_VersionDisplay.GetWindowRect(&cRect);
- this->ScreenToClient(&cRect);
- m_VersionDisplay.SetWindowPos(&wndBottom, cRect.left, cRect.top + deltay,
- cRect.Width() + deltax/2, cRect.Height(),
- SWP_NOCOPYBITS);
-
-
m_Configure.GetWindowRect(&cRect);
this->ScreenToClient(&cRect);
diff --git a/Source/MFCDialog/CMakeSetupDialog.h b/Source/MFCDialog/CMakeSetupDialog.h
index fc3c413..6812f9e 100644
--- a/Source/MFCDialog/CMakeSetupDialog.h
+++ b/Source/MFCDialog/CMakeSetupDialog.h
@@ -57,7 +57,7 @@ protected:
void RemoveAdvancedValues();
// Dialog Data
//{{AFX_DATA(CMakeSetupDialog)
- enum { IDD = IDD_CMakeSetupDialog_DIALOG };
+ enum { IDD = IDD_CMakeSetupDialog_DIALOG };
CButton m_AdvancedValuesControl;
CStatic m_BuildForLabel;
CButton m_BrowseSource;
@@ -74,12 +74,11 @@ protected:
CComboBox m_WhereBuildControl;
CPropertyList m_CacheEntriesList;
CStatic m_MouseHelp;
- CStatic m_VersionDisplay;
CStatic m_StatusDisplay;
CButton m_Configure;
CString m_GeneratorChoiceString;
BOOL m_AdvancedValues;
- //}}AFX_DATA
+ //}}AFX_DATA
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMakeSetupDialog)