SVN commit 430307 by buis: Adding RenderLineEdit this time :) Also enabling some code that was commented out. M +8 -9 impl/HTMLGenericFormElementImpl.cc M +1 -2 impl/HTMLSelectElementImpl.cc A rendering/RenderLineEdit.cc [License: LGPL (wrong address)] A rendering/RenderLineEdit.h [License: LGPL (v2+) (wrong address)] --- trunk/kdenonbeta/khtml2/impl/HTMLGenericFormElementImpl.cc #430306:430307 @@ -24,6 +24,8 @@ #include "HTMLGenericFormElementImpl.h" #include "HTMLFormElementImpl.h" +#include "HTMLInputElementImpl.h" +#include "RenderWidget.h" #include #include @@ -127,13 +129,12 @@ } NodeBaseImpl::attach(); -#if 0 + // The call to updateFromElement() needs to go after the call through // to the base class's attach() because that can sometimes do a close // on the renderer. - if (m_render) - m_render->updateFromElement(); -#endif + if(m_render) + static_cast(m_render)->updateFromElement(); } HTMLFormElementImpl *HTMLGenericFormElementImpl::getForm() const @@ -198,16 +199,14 @@ bool HTMLGenericFormElementImpl::isFocusable() const { -#if 0 - return (m_render && m_render->isWidget() && - static_cast(m_render)->widget() && - static_cast(m_render)->widget()->focusPolicy() >= QWidget::TabFocus) || + return (m_render && static_cast(m_render)->isWidget() && + static_cast(static_cast(m_render))->widget() && + static_cast(static_cast(m_render))->widget()->focusPolicy() >= QWidget::TabFocus) || /* INPUT TYPE="image" supports focus too */ ( id() == ID_INPUT && static_cast(this)->inputType() == HTMLInputElementImpl::IMAGE ); -#endif } class FocusHandleWidget : public QWidget --- trunk/kdenonbeta/khtml2/impl/HTMLSelectElementImpl.cc #430306:430307 @@ -471,10 +471,9 @@ static_cast(items[i])->m_selected = (items[i] == selectedOption); } } -#if 0 if(m_render) static_cast(m_render)->setSelectionChanged(true); -#endif + setChanged(true); }