Tag: cws_src680_reportdesign01 User: lla Date: 2007-10-15 12:50:06+0000 Modified: dba/reportdesign/source/ui/dlg/DateTime.cxx dba/reportdesign/source/ui/dlg/DateTime.src dba/reportdesign/source/ui/dlg/DateTime.hrc
Log: #i77464# new date time dialog File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: DateTime.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/DateTime.cxx?r1=1.3&r2=1.3.20.1 Delta lines: +89 -39 --------------------- --- DateTime.cxx 2007-08-02 14:36:18+0000 1.3 +++ DateTime.cxx 2007-10-15 12:50:04+0000 1.3.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: DateTime.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.20.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:36:18 $ + * last change: $Author: lla $ $Date: 2007/10/15 12:50:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -121,22 +121,23 @@ ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) : ModalDialog( _pParent, ModuleRes(RID_DATETIME_DLG) ) - ,m_aFLDate(this, ModuleRes(FL_DATE ) ) ,m_aDate(this, ModuleRes(CB_DATE ) ) - ,m_aDateF1(this, ModuleRes(RB_DATE_F1 ) ) - ,m_aDateF2(this, ModuleRes(RB_DATE_F2 ) ) - ,m_aDateF3(this, ModuleRes(RB_DATE_F3 ) ) - ,m_aFLTime(this, ModuleRes(FL_TIME ) ) + ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) + ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) + ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) ,m_aTime(this, ModuleRes(CB_TIME ) ) - ,m_aTimeF1(this, ModuleRes(RB_TIME_F1 ) ) - ,m_aTimeF2(this, ModuleRes(RB_TIME_F2 ) ) - ,m_aTimeF3(this, ModuleRes(RB_TIME_F3 ) ) - ,m_aFL1(this,ModuleRes(FL_SEPARATOR1) ) + ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) + ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) + ,m_aFL1(this, ModuleRes(FL_SEPARATOR1) ) ,m_aPB_OK(this, ModuleRes(PB_OK)) ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_pController(_pController) ,m_xHoldAlive(_xHoldAlive) + ,m_nDateEntryCount(0) + ,m_nTimeEntryCount(0) + ,m_aDateControlling() + ,m_aTimeControlling() { DBG_CTOR( rpt_ODateTimeDialog,NULL); @@ -148,13 +149,45 @@ catch(uno::Exception&) { } - m_aDateF1.SetText(getFormatString(i18n::NumberFormatIndex::DATE_SYSTEM_LONG)); - m_aDateF2.SetText(getFormatString(i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY)); - m_aDateF3.SetText(getFormatString(i18n::NumberFormatIndex::DATE_SYSTEM_SHORT)); - - m_aTimeF1.SetText(getFormatString(i18n::NumberFormatIndex::TIME_HHMMSS)); - m_aTimeF2.SetText(getFormatString(i18n::NumberFormatIndex::TIME_HHMMSSAMPM)); - m_aTimeF3.SetText(getFormatString(i18n::NumberFormatIndex::TIME_HHMM)); + // Fill listbox with all well known date types + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYSTEM_LONG); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_DDMMYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_DIN_DMMMYYYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_DMMMMYYYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_DIN_DMMMMYYYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_NNDMMMYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_DEF_NNDDMMMYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_NNDMMMMYYYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_NNNNDMMMMYYYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_DIN_MMDD); + InsertDateEntry(i18n::NumberFormatIndex::DATE_DIN_YYMMDD); + InsertDateEntry(i18n::NumberFormatIndex::DATE_DIN_YYYYMMDD); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_MMYY); + InsertDateEntry(i18n::NumberFormatIndex::DATE_SYS_DDMMM); + InsertDateEntry(i18n::NumberFormatIndex::DATE_MMMM); + InsertDateEntry(i18n::NumberFormatIndex::DATE_QQJJ); + InsertDateEntry(i18n::NumberFormatIndex::DATE_WW); + + m_aDateListBox.SetDropDownLineCount(20); + m_aDateListBox.SelectEntryPos(0); + + // Fill listbox with all well known time types + + InsertTimeEntry(i18n::NumberFormatIndex::TIME_HHMMSS); + InsertTimeEntry(i18n::NumberFormatIndex::TIME_HHMMSSAMPM); + InsertTimeEntry(i18n::NumberFormatIndex::TIME_HHMM); + InsertTimeEntry(i18n::NumberFormatIndex::TIME_HH_MMSS); + InsertTimeEntry(i18n::NumberFormatIndex::TIME_MMSS00); + InsertTimeEntry(i18n::NumberFormatIndex::TIME_HH_MMSS00); + + m_aTimeListBox.SetDropDownLineCount(20); + m_aTimeListBox.SelectEntryPos(0); + + // use nice enhancement, to toggle enable/disable if a checkbox is checked or not + m_aDateControlling.enableOnCheckMark( m_aDate, m_aFTDateFormat, m_aDateListBox); + m_aTimeControlling.enableOnCheckMark( m_aTime, m_aFTTimeFormat, m_aTimeListBox); CheckBox* pCheckBoxes[] = { &m_aDate,&m_aTime}; for ( size_t i = 0 ; i < sizeof(pCheckBoxes)/sizeof(pCheckBoxes[0]); ++i) @@ -162,6 +195,19 @@ FreeResource(); } +// ----------------------------------------------------------------------------- + void ODateTimeDialog::InsertDateEntry(sal_Int16 _nNumberFormatId) + { + sal_Int16 nPos = m_aDateListBox.InsertEntry( getFormatString(_nNumberFormatId) ); + // m_aDateListBox.SetEntryFlags(m_nDateEntryCount, _nNumberFormatId); + m_aDateListBox.SetEntryData(nPos, reinterpret_cast<void*>(_nNumberFormatId)); + } + void ODateTimeDialog::InsertTimeEntry(sal_Int16 _nNumberFormatId) + { + sal_Int16 nPos = m_aTimeListBox.InsertEntry( getFormatString(_nNumberFormatId) ); + // m_aTimeListBox.SetEntryFlags(m_nTimeEntryCount, _nNumberFormatId); + m_aTimeListBox.SetEntryData(nPos, reinterpret_cast<void*>(_nNumberFormatId)); + } //------------------------------------------------------------------------ ODateTimeDialog::~ODateTimeDialog() @@ -240,36 +286,40 @@ // ----------------------------------------------------------------------------- IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox ) { + (void)_pBox; DBG_CHKTHIS( rpt_ODateTimeDialog,NULL); - RadioButton* pRadioButtons[] = { &m_aDateF1,&m_aDateF2,&m_aDateF3, &m_aTimeF1, &m_aTimeF2, &m_aTimeF3}; - int i = 0; - int nCount = 3; - sal_Bool bShow = sal_False; - if ( _pBox == &m_aDate ) + if ( _pBox == &m_aDate || _pBox == &m_aTime) + { + sal_Bool bDate = m_aDate.IsChecked(); + sal_Bool bTime = m_aTime.IsChecked(); + if (!bDate && !bTime) { - bShow = m_aDate.IsChecked(); + m_aPB_OK.Disable(); } - else if ( _pBox == &m_aTime ) + else { - bShow = m_aTime.IsChecked(); - i = 3; - nCount = sizeof(pRadioButtons)/sizeof(pRadioButtons[0]); + m_aPB_OK.Enable(); + } } - - for ( ; i < nCount ; ++i) - pRadioButtons[i]->Enable(bShow); return 1L; } // ----------------------------------------------------------------------------- sal_Int16 ODateTimeDialog::getFormatIndex(sal_Bool _bDate) { DBG_CHKTHIS( rpt_ODateTimeDialog,NULL); + (void)_bDate; sal_Int16 nFormat; if ( _bDate ) - nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); + { + // nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); + nFormat = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aDateListBox.GetEntryData( m_aDateListBox.GetSelectEntryPos() ))); + } else - nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); + { + // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); + nFormat = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aTimeListBox.GetEntryData( m_aTimeListBox.GetSelectEntryPos() ))); + } return nFormat; } // ----------------------------------------------------------------------------- File [changed]: DateTime.src Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/DateTime.src?r1=1.2.28.1&r2=1.2.28.2 Delta lines: +41 -52 --------------------- --- DateTime.src 2007-09-07 08:33:32+0000 1.2.28.1 +++ DateTime.src 2007-10-15 12:50:04+0000 1.2.28.2 @@ -4,9 +4,9 @@ * * $RCSfile: DateTime.src,v $ * - * $Revision: 1.2.28.1 $ + * $Revision: 1.2.28.2 $ * - * last change: $Author: oj $ $Date: 2007/09/07 08:33:32 $ + * last change: $Author: lla $ $Date: 2007/10/15 12:50:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,94 +53,83 @@ Moveable = TRUE ; Closeable = TRUE ; - FixedLine FL_DATE - { - Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Date"; - }; - CheckBox CB_DATE { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ; + Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Check = TRUE; Text [ en-US ] = "Include Date"; }; - RadioButton RB_DATE_F1 - { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + UNRELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; - Group = TRUE; - Check = TRUE; - }; - RadioButton RB_DATE_F2 + FixedText FT_DATE_FORMAT { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT ); + Size = MAP_APPFONT( BUTTON_WIDTH - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); + Text [ en-US ] = "Format"; }; - RadioButton RB_DATE_F3 + ListBox LB_DATE_TYPE { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ; + Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 ); + Border = TRUE; + DropDown = TRUE; + TabStop = TRUE; + Sort = FALSE; }; - FixedLine FL_TIME + + FixedLine FL_SEPARATOR0 { - Pos = MAP_APPFONT ( RELATED_CONTROLS , 4*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Time"; + Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; + Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; + // Text [ en-US ] = "Time"; }; CheckBox CB_TIME { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 5*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; + Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Check = TRUE; Text [ en-US ] = "Include Time"; }; - RadioButton RB_TIME_F1 - { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; - Group = TRUE; - Check = TRUE; - }; - RadioButton RB_TIME_F2 + FixedText FT_TIME_FORMAT { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 7*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT); + Size = MAP_APPFONT( BUTTON_WIDTH - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); + Text [ en-US ] = "Format"; }; - RadioButton RB_TIME_F3 + ListBox LB_TIME_TYPE { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 8*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; + Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 ); + Border = TRUE; + DropDown = TRUE; + TabStop = TRUE; + Sort = FALSE; }; - FixedLine FL_SEPARATOR1 { - Pos = MAP_APPFONT ( RELATED_CONTROLS , 8*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT) ; + Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; }; OKButton PB_OK { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 9*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT +1) ; + Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; TabStop = TRUE ; DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + BUTTON_WIDTH , 9*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT +1) ; + Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; TabStop = TRUE ; }; HelpButton PB_HELP { TabStop = TRUE ; - Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , 9*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT +1) ; + Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; }; File [changed]: DateTime.hrc Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/DateTime.hrc?r1=1.2&r2=1.2.28.1 Delta lines: +13 -18 --------------------- --- DateTime.hrc 2007-07-09 11:56:29+0000 1.2 +++ DateTime.hrc 2007-10-15 12:50:04+0000 1.2.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: DateTime.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.28.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:29 $ + * last change: $Author: lla $ $Date: 2007/10/15 12:50:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,33 +36,28 @@ #define RPTUI_DATETIME_HRC #define CB_DATE (1) -#define RB_DATE_F1 (2) -#define RB_DATE_F2 (3) -#define RB_DATE_F3 (4) +#define FT_DATE_FORMAT (2) +#define LB_DATE_TYPE (3) +#define FL_SEPARATOR0 (4) #define CB_TIME (5) -#define RB_TIME_F1 (6) -#define RB_TIME_F2 (7) -#define RB_TIME_F3 (8) -#define FL_SAMPLE (9) -#define PB_OK (10) -#define PB_CANCEL (11) -#define PB_HELP (12) -#define FT_DATESAMPLE (13) -#define FL_SEPARATOR1 (14) -#define FT_TIMESAMPLE (15) -#define FL_DATE (16) -#define FL_TIME (17) +#define FT_TIME_FORMAT (6) +#define LB_TIME_TYPE (7) +#define FL_SEPARATOR1 (8) +#define PB_OK (9) +#define PB_CANCEL (10) +#define PB_HELP (11) #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 #define RELATED_CONTROLS 4 #define UNRELATED_CONTROLS 7 #define EDIT_HEIGHT 12 +#define LISTBOX_HEIGHT 12 #define BUTTON_HEIGHT 14 #define BUTTON_WIDTH 50 #define BROWSER_HEIGHT 75 #define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT (10*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT +1 + BUTTON_HEIGHT) +#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) #define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_DATETIME_HRC --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
