[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/khtml2
From:       Rob Buis <rwlbuis () xs4all ! nl>
Date:       2005-06-30 20:56:52
Message-ID: 1120165012.613423.18719.nullmailer () svn ! kde ! org
[Download RAW message or body]

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 <kdom/css/impl/cssproperties.h>
 #include <kdom/css/impl/cssvalues.h>
@@ -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<RenderObject *>(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<RenderWidget*>(m_render)->widget() &&
-        static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() >= \
QWidget::TabFocus) || +    return (m_render && static_cast<RenderObject \
*>(m_render)->isWidget() && +        \
static_cast<RenderWidget*>(static_cast<RenderObject *>(m_render))->widget() && +      \
static_cast<RenderWidget*>(static_cast<RenderObject \
*>(m_render))->widget()->focusPolicy() >= QWidget::TabFocus) ||  /* INPUT \
TYPE="image" supports focus too */  (
 			id() == ID_INPUT &&
 			static_cast<const HTMLInputElementImpl *>(this)->inputType() == \
HTMLInputElementImpl::IMAGE  );
-#endif
 }
 
 class FocusHandleWidget : public QWidget
--- trunk/kdenonbeta/khtml2/impl/HTMLSelectElementImpl.cc #430306:430307
@@ -471,10 +471,9 @@
 				static_cast<HTMLOptionElementImpl*>(items[i])->m_selected = (items[i] == \
selectedOption);  }
 	}
-#if 0
 	if(m_render)
 		static_cast<RenderSelect*>(m_render)->setSelectionChanged(true);
-#endif
+
 	setChanged(true);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]