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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdeui
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-10-06 12:50:59
Message-ID: 20041006125059.1D7BE128A1 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Backport r1.144.


  M +11 -0     kmainwindow.cpp   1.138.2.2
  M +6 -0      kmainwindow.h   1.114.2.3


--- kdelibs/kdeui/kmainwindow.cpp  #1.138.2.1:1.138.2.2
@@ -1193,4 +1193,15 @@ QSize KMainWindow::sizeForCentralWidgetS
 }
 
+#if KDE_IS_VERSION( 3, 9, 0 )
+#warning Remove, should be in Qt
+#endif
+void KMainWindow::setIcon( const QPixmap& p )
+{
+    QMainWindow::setIcon( p );
+    // Qt3 doesn't support _NET_WM_ICON, but KApplication::setTopWidget(), which
+    // is used by KMainWindow, sets it
+    KWin::setIcons( winId(), p, QPixmap());
+}
+
 // why do we support old gcc versions? using KXMLGUIBuilder::finalizeGUI;
 // DF: because they compile KDE much faster :)

--- kdelibs/kdeui/kmainwindow.h  #1.114.2.2:1.114.2.3
@@ -638,4 +638,10 @@ public:
     QSize sizeForCentralWidgetSize(QSize size) KDE_DEPRECATED;
 
+    /**
+     * @internal
+     */
+    // KDE4 remove
+    virtual void setIcon( const QPixmap & );
+
 public slots:
     /**


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