Tag: cws_src680_dbwizard3 User: bc Date: 05/01/21 01:18:42 Modified: /dba/dbaccess/source/ui/control/ FieldDescControl.cxx
Log: RESYNC: (1.35-1.36); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: FieldDescControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/FieldDescControl.cxx?r1=1.34.28.2&r2=1.34.28.3 Delta lines: +35 -23 --------------------- --- FieldDescControl.cxx 8 Dec 2004 14:38:11 -0000 1.34.28.2 +++ FieldDescControl.cxx 21 Jan 2005 09:18:39 -0000 1.34.28.3 @@ -907,6 +907,17 @@ { m_pAutoIncrementValue, m_pAutoIncrementValueText, 3 }, }; + long nMaxWidth = 0; + for (int i=0; i<sizeof(adAggregates)/sizeof(adAggregates[0]); i++) + { + if (adAggregates[i].pctrlTextControl) + { + nMaxWidth = ::std::max<long>(OutputDevice::GetTextWidth(adAggregates[i].pctrlTextControl->GetText()),nMaxWidth); + } + } + + OSL_ENSURE(nMaxWidth != 0,"Invalid width!"); + // und los ... int nCurrentControlPos = 0; Control* pZOrderPredecessor = NULL; @@ -961,8 +972,8 @@ pDefaultText->SetText( ModuleRes(STR_DEFAULT_VALUE) ); pDefault = new OPropEditCtrl( this, STR_HELP_DEFAULT_VALUE, FIELD_PROPERTY_DEFAULT, WB_BORDER ); pDefault->SetHelpId(HID_TAB_ENT_DEFAULT); - SetPosSize( (Control**)&pDefaultText, m_nPos, 0 ); - SetPosSize( (Control**)&pDefault, m_nPos, 3 ); + // SetPosSize( (Control**)&pDefaultText, m_nPos, 0 ); + // SetPosSize( (Control**)&pDefault, m_nPos, 3 ); pDefault->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pDefault->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -978,8 +989,8 @@ m_pAutoIncrementValueText->SetText( ModuleRes(STR_AUTOINCREMENT_VALUE) ); m_pAutoIncrementValue = new OPropEditCtrl( this, STR_HELP_AUTOINCREMENT_VALUE, FIELD_PRPOERTY_AUTOINCREMENT, WB_BORDER ); m_pAutoIncrementValue->SetHelpId(HID_TAB_AUTOINCREMENTVALUE); - SetPosSize( (Control**)&m_pAutoIncrementValueText, m_nPos, 0 ); - SetPosSize( (Control**)&m_pAutoIncrementValue, m_nPos, 3 ); + // SetPosSize( (Control**)&m_pAutoIncrementValueText, m_nPos, 0 ); + // SetPosSize( (Control**)&m_pAutoIncrementValue, m_nPos, 3 ); m_pAutoIncrementValue->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); m_pAutoIncrementValue->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1008,8 +1019,8 @@ pRequired->SelectEntryPos(1); pRequired->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); - SetPosSize( (Control**)&pRequiredText, m_nPos, 0 ); - SetPosSize( (Control**)&pRequired, m_nPos, 2 ); + // SetPosSize( (Control**)&pRequiredText, m_nPos, 0 ); + // SetPosSize( (Control**)&pRequired, m_nPos, 2 ); pRequired->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pRequired->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1034,8 +1045,8 @@ pAutoIncrement->SelectEntryPos(0); pAutoIncrement->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); - SetPosSize( (Control**)&pAutoIncrementText, m_nPos, 0 ); - SetPosSize( (Control**)&pAutoIncrement, m_nPos, 2 ); + // SetPosSize( (Control**)&pAutoIncrementText, m_nPos, 0 ); + // SetPosSize( (Control**)&pAutoIncrement, m_nPos, 2 ); pAutoIncrement->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pAutoIncrement->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1058,8 +1069,8 @@ pTextLen->SetStrictFormat(TRUE); pTextLen->SetHelpId(HID_TAB_ENT_TEXT_LEN); - SetPosSize( (Control**)&pTextLenText, m_nPos, 0 ); - SetPosSize( (Control**)&pTextLen, m_nPos, 1 ); + // SetPosSize( (Control**)&pTextLenText, m_nPos, 0 ); + // SetPosSize( (Control**)&pTextLen, m_nPos, 1 ); pTextLen->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pTextLen->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1086,8 +1097,8 @@ m_pType->SelectEntryPos(0); m_pType->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); - SetPosSize( (Control**)&m_pTypeText, m_nPos, 0 ); - SetPosSize( (Control**)&m_pType, m_nPos, 2 ); + // SetPosSize( (Control**)&m_pTypeText, m_nPos, 0 ); + // SetPosSize( (Control**)&m_pType, m_nPos, 2 ); m_pType->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); m_pType->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1115,8 +1126,8 @@ m_pColumnName->setCheck( isSQL92CheckEnabled(getConnection()) ); } - SetPosSize( (Control**)&m_pColumnNameText, m_nPos, 0 ); - SetPosSize( (Control**)&m_pColumnName, m_nPos, 1 ); + // SetPosSize( (Control**)&m_pColumnNameText, m_nPos, 0 ); + // SetPosSize( (Control**)&m_pColumnName, m_nPos, 1 ); m_pColumnName->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); m_pColumnName->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1143,8 +1154,8 @@ pNumType->SelectEntryPos(2); pNumType->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); - SetPosSize( (Control**)&pNumTypeText, m_nPos, 0 ); - SetPosSize( (Control**)&pNumType, m_nPos, 1 ); + // SetPosSize( (Control**)&pNumTypeText, m_nPos, 0 ); + // SetPosSize( (Control**)&pNumType, m_nPos, 1 ); pNumType->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pNumType->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1167,8 +1178,8 @@ pLength->SetStrictFormat(TRUE); pLength->SetHelpId(HID_TAB_ENT_LEN); - SetPosSize( (Control**)&pLengthText, m_nPos, 0 ); - SetPosSize( (Control**)&pLength, m_nPos, 1 ); + // SetPosSize( (Control**)&pLengthText, m_nPos, 0 ); + // SetPosSize( (Control**)&pLength, m_nPos, 1 ); pLength->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pLength->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1191,8 +1202,8 @@ pScale->SetHelpId(HID_TAB_ENT_SCALE); - SetPosSize( (Control**)&pScaleText, m_nPos, 0 ); - SetPosSize( (Control**)&pScale, m_nPos, 1 ); + // SetPosSize( (Control**)&pScaleText, m_nPos, 0 ); + // SetPosSize( (Control**)&pScale, m_nPos, 1 ); pScale->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pScale->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1243,8 +1254,8 @@ pBoolDefault->InsertEntry(aYes); pBoolDefault->InsertEntry(aNo); pBoolDefault->SetHelpId(HID_TAB_ENT_BOOL_DEFAULT); - SetPosSize( (Control**)&pBoolDefaultText, m_nPos, 0 ); - SetPosSize( (Control**)&pBoolDefault, m_nPos, 3 ); + // SetPosSize( (Control**)&pBoolDefaultText, m_nPos, 0 ); + // SetPosSize( (Control**)&pBoolDefault, m_nPos, 3 ); pBoolDefault->SetGetFocusHdl(LINK(this, OFieldDescControl, OnControlFocusGot)); pBoolDefault->SetLoseFocusHdl(LINK(this, OFieldDescControl, OnControlFocusLost)); @@ -1470,6 +1481,7 @@ { case 0: aPosition.X() = 0; + aPosition.Y() = 1; break; case 1: case 2: @@ -1487,7 +1499,7 @@ aPosition.X() = 0; } - aPosition.Y() = ((nRow+1)*CONTROL_SPACING_Y) + + aPosition.Y() += ((nRow+1)*CONTROL_SPACING_Y) + (nRow*CONTROL_HEIGHT); ////////////////////////////////////////////////////////////////////// --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
