Automated update from Qt3

1 files changed, 34 insertions, 1 deletions

diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 7aa144091..ef31c25ca 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -48,6 +48,7 @@
 #include "ntqlayout.h"
 #include "ntqlistview.h"
 #include "ntqpopupmenu.h"
+#include "ntqpushbutton.h"
 #include "ntqobjectlist.h"
 #include "ntqwidgetlist.h"
 
@@ -2165,7 +2166,16 @@ bool TQStyle::eventFilter(TQObject *o, TQEvent *e) {
 		TQStyle* handler = m_objectEventSourceToHandlerMap[o];
 		TQStyleControlElementData ceData = m_objectEventSourceDataToHandlerMap[o];
 		ControlElementFlags elementFlags = m_objectEventSourceFlagsToHandlerMap[o];
-		bool ret = handler->objectEventHandler(ceData, elementFlags, o, e);
+		bool ret;
+		TQWidget* w = dynamic_cast<TQWidget*>(o);
+		if ((w) && (e->type() == TQEvent::Paint)) {
+			TQPainter p(w);
+			ceData.activePainter = &p;
+			ret = handler->objectEventHandler(ceData, elementFlags, o, e);
+		}
+		else {
+			ret = handler->objectEventHandler(ceData, elementFlags, o, e);
+		}
 		if (ret) {
 			return ret;
 		}
@@ -2291,6 +2301,21 @@ bool TQStyle::widgetActionRequest( TQStyleControlElementData ceData, ControlElem
 				}
     				delete list;
 			}
+			else if (request == WAR_SetDefault) {
+				TQPushButton *button = dynamic_cast<TQPushButton*>(widget);
+				if (button) {
+					button->setDefault(TRUE);
+				}
+			}
+			else if (request == WAR_UnSetDefault) {
+				TQPushButton *button = dynamic_cast<TQPushButton*>(widget);
+				if (button) {
+					button->setDefault(FALSE);
+				}
+			}
+			else if (request == WAR_SendPaintEvent) {
+				static_cast<TQObject*>(widget)->event(requestData.paintEvent);
+			}
 			return true;
 		}
 	}
@@ -2395,6 +2420,10 @@ TQStyleWidgetActionRequestData::TQStyleWidgetActionRequestData(TQRect param) {
 	rect = param;
 }
 
+TQStyleWidgetActionRequestData::TQStyleWidgetActionRequestData(TQPaintEvent* param) {
+	paintEvent = param;
+}
+
 TQStyleWidgetActionRequestData::~TQStyleWidgetActionRequestData() {
 	//
 }
@@ -2575,4 +2604,8 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp
   \obsolete
 */
 
+TQStyleControlElementData::TQStyleControlElementData() {
+	activePainter = 0;
+}
+
 #endif // QT_NO_STYLE