no_popupmenu_3.5.patch

来自「konqueror3 embedded版本, KDE环境下的当家浏览器的嵌入式版」· PATCH 代码 · 共 67 行

--- khtml_part.cpp.orig	2005-11-30 15:12:04.000000000 +0100
+++ khtml_part.cpp	2005-11-30 15:12:04.000000000 +0100
@@ -476,8 +476,10 @@ KHTMLPart::~KHTMLPart()
   config->setGroup( "HTML Settings" );
   config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage );
 
+#ifndef KONQ_EMBEDDED
   delete d->m_automaticDetection;
   delete d->m_manualDetection;
+#endif
 
   slotWalletClosed();
   if (!parentPart()) { // only delete it if the top khtml_part closes
@@ -4227,12 +4229,14 @@ void KHTMLPart::slotSaveFrame()
 
 void KHTMLPart::slotSetEncoding()
 {
+#ifndef KONQ_EMBEDDED
   d->m_automaticDetection->setItemChecked( int( d->m_autoDetectLanguage ), false );
   d->m_paSetEncoding->popupMenu()->setItemChecked( 0, false );
   d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), true );
 
   QString enc = KGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() );
   setEncoding( enc, true );
+#endif // KONQ_EMBEDDED
 }
 
 void KHTMLPart::slotUseStylesheet()
@@ -4937,6 +4941,7 @@ void KHTMLPart::submitForm( const char *
 
 void KHTMLPart::popupMenu( const QString &linkUrl )
 {
+#ifndef KONQ_EMBEDDED
   KURL popupURL;
   KURL linkKURL;
   KParts::URLArgs args;
@@ -5022,6 +5027,7 @@ void KHTMLPart::popupMenu( const QString
      emit popupMenu(linkUrl, QCursor::pos());
      d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
   }
+#endif // KONQ_EMBEDDED
 }
 
 void KHTMLPart::slotParentCompleted()
@@ -7040,6 +7046,7 @@ void KHTMLPart::setPluginPageQuestionAsk
 
 void KHTMLPart::slotAutomaticDetectionLanguage( int _id )
 {
+#ifndef KONQ_EMBEDDED
   d->m_automaticDetection->setItemChecked( _id, true );
 
   switch ( _id ) {
@@ -7098,13 +7105,10 @@ void KHTMLPart::slotAutomaticDetectionLa
       d->m_automaticDetection->setItemChecked( i, false );
   }
 
-#ifndef KONQ_EMBEDDED
   d->m_paSetEncoding->popupMenu()->setItemChecked( 0, true );
-#endif // KONQ_EMBEDDED
 
   setEncoding( QString::null, false );
 
-#ifndef KONQ_EMBEDDED
   if( d->m_manualDetection )
     d->m_manualDetection->setCurrentItem( -1 );
   d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), false );