Apply all Qt3.3.8d patches

NOTE: This will *likely* break compilation of TQt4
Please wait a few days for fixes to be committed as needed!

1 files changed, 26 insertions, 6 deletions

diff --git a/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/tqtinterface/qt4/src/widgets/tqcombobox.cpp
index d152da2..6305993 100644
--- a/tqtinterface/qt4/src/widgets/tqcombobox.cpp
+++ b/tqtinterface/qt4/src/widgets/tqcombobox.cpp
@@ -392,12 +392,8 @@ public:
     inline TQListBox * listBox() { return lBox; }
     inline TQComboBoxPopup * popup() { return pop; }
     void updateLinedGeometry();
-
-    void setListBox( TQListBox *l ) { lBox = l ; usingLBox = TRUE;
-				l->setMouseTracking( TRUE );}
-
-    void setPopupMenu( TQComboBoxPopup * pm, bool isPopup=TRUE )
-	{ pop = pm; if(isPopup) usingLBox = FALSE; }
+    void setListBox( TQListBox *l );
+    void setPopupMenu( TQComboBoxPopup * pm, bool isPopup=TRUE );
 
     int		current;
     int		maxCount;
@@ -443,6 +439,30 @@ void TQComboBoxData::updateLinedGeometry()
 	ed->setGeometry( r );
 }
 
+void TQComboBoxData::setListBox( TQListBox *l )
+{
+    lBox = l;
+    usingLBox = TRUE;
+    l->setMouseTracking( TRUE );
+#ifdef TQ_WS_X11
+    l->x11SetWindowType( TQWidget::X11WindowTypeCombo );
+    l->x11SetWindowTransient( combo->tqtopLevelWidget());
+#endif
+}
+
+void TQComboBoxData::setPopupMenu( TQComboBoxPopup * pm, bool isPopup )
+{
+    pop = pm;
+    if(isPopup)
+        usingLBox = FALSE;
+#ifdef TQ_WS_X11
+    if( pm ) {
+        pm->x11SetWindowType( TQWidget::X11WindowTypeCombo );
+        pm->x11SetWindowTransient( combo->tqtopLevelWidget());
+    }
+#endif
+}
+
 static inline bool checkInsertIndex( const char *method, const char * name,
 				     int count, int *index)
 {