|
|
@ -100,9 +100,9 @@ dotNETstyle::~dotNETstyle()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool dotNETstyle::inheritsKHTML(const TQWidget* w) const
|
|
|
|
bool dotNETstyle::inheritsTDEHTML(const TQWidget* w) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (w->parentWidget(true) && w->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true)->inherits("KHTMLView")) {
|
|
|
|
if (w->parentWidget(true) && w->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true) && w->parentWidget(true)->parentWidget(true)->parentWidget(true)->inherits("TDEHTMLView")) {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
@ -124,7 +124,7 @@ void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElement
|
|
|
|
// to update the palette again.
|
|
|
|
// to update the palette again.
|
|
|
|
// bool extraPalette = false;
|
|
|
|
// bool extraPalette = false;
|
|
|
|
|
|
|
|
|
|
|
|
if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsKHTML(widget)) {
|
|
|
|
if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) {
|
|
|
|
installObjectEventHandler(ceData, elementFlags, ptr, this);
|
|
|
|
installObjectEventHandler(ceData, elementFlags, ptr, this);
|
|
|
|
updatePalette( (TQComboBox*) widget );
|
|
|
|
updatePalette( (TQComboBox*) widget );
|
|
|
|
// extraPalette = true;
|
|
|
|
// extraPalette = true;
|
|
|
@ -156,7 +156,7 @@ void dotNETstyle::unPolish(const TQStyleControlElementData &ceData, ControlEleme
|
|
|
|
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
|
|
|
|
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
|
|
|
|
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
|
|
|
|
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
|
|
|
|
|
|
|
|
|
|
|
|
if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsKHTML(widget)) {
|
|
|
|
if (ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING) && !inheritsTDEHTML(widget)) {
|
|
|
|
removeObjectEventHandler(ceData, elementFlags, ptr, this);
|
|
|
|
removeObjectEventHandler(ceData, elementFlags, ptr, this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|