applied patch 446836: removed qt headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/accel.h b/include/wx/accel.h
index f51578538cf5b047ba72fe905ba607ee36cc3647..40676ee7f0803f0049d2665788c123e2c567df04 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -105,8 +105,6 @@ private:
     #include "wx/motif/accel.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/accel.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/app.h b/include/wx/app.h
index 1ea9b4c11a89a9c56707e7f570fb1a34b6e44aa0..36e9e1979064857be0e44169246541d53fbee75a 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -331,8 +331,6 @@ protected:
         #include "wx/motif/app.h"
     #elif defined(__WXMGL__)
         #include "wx/mgl/app.h"
-    #elif defined(__WXQT__)
-        #include "wx/qt/app.h"
     #elif defined(__WXGTK__)
         #include "wx/gtk/app.h"
     #elif defined(__WXMAC__)

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 9e6f11f984dd5ffe6a72c95549451458fb3dc3e3..aa86bc86b90f0552072c42f04b0457e8f9860a22 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -161,8 +161,6 @@ protected:
 #include "wx/gtk/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
-#elif defined(__WXQT__)
-#include "wx/qt/bitmap.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 7c1ad834fd4e4d8477b99906bea5c107268cfa7a..884796042a14c03ea49cf34c05014df17af4205a 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -83,8 +83,6 @@ private:
     #include "wx/motif/bmpbuttn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/bmpbuttn.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/brush.h b/include/wx/brush.h
index ddcae04a49837c35a467ea4e0d503bcbdbdb2084..b8ddfd018125322c2ef8edfe225ae4ac72966857 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/brush.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/brush.h"
-#elif defined(__WXQT__)
-#include "wx/qt/brush.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/brush.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/button.h b/include/wx/button.h
index 0a7ccc6a8b6bf8c624a2d0208d69c9c28627d858..4e75d97c335756d36c8ce0dbf560a0393327abb3 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -66,8 +66,6 @@ public:
     #include "wx/motif/button.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/button.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 7b59f052110628a83f4f869705c6366d7fd4ae51..5b43a6af37ded135bc8006c203d86f2077109723 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -40,8 +40,6 @@ public:
     #include "wx/motif/checkbox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/checkbox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 955c533445b587a5a05d6a44904070ea20cb59f3..9231f6b17874bc5760f4b826893ae5725ecd17ad 100644 (file)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -36,8 +36,6 @@ public:
     #include "wx/motif/checklst.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/checklst.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/checklst.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checklst.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/choice.h b/include/wx/choice.h
index a99e477cd2336edcdd55fa5b03ace9da31f353fb..b94a76c6e20e36685babd1506be4df6d8268d4bd 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -69,8 +69,6 @@ public:
     #include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/choice.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index d04fa7df9ab3ed415aacf80ea3601727217b69e4..25c9b7f8068d42ac9ae6e36d976cd9dd9c58f239 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -90,8 +90,6 @@ public:
     #include "wx/gtk/clipbrd.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
-#elif defined(__WXQT__)
-    #include "wx/gtk/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/clipbrd.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 18f5ab4809efd5a6e0ac4a1728180bbe5d2cde67..9f43002689166867420a520a0e82bc41a3ffe311 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 6255f13225651af711bf9fcb2e0ba08666fbdd89..237f471e8f91d0f84bcb0cc6a67d64c14618f9fd 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -59,8 +59,6 @@ public:
     #include "wx/motif/combobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/combobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/combobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/combobox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/control.h b/include/wx/control.h
index 6858103d6e2b3f82e3d53868e4e53edaaf9e1147..549f98d1837422a2983379ec46088af954da60fe 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -82,8 +82,6 @@ protected:
     #include "wx/motif/control.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/control.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index b226494baeda90d84f79747ac687a71de697b435..cc89879e13e302c931dd082d8965e28b87b4ff20 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/cursor.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/cursor.h"
-#elif defined(__WXQT__)
-#include "wx/qt/cursor.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/cursor.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index e1f345e2d92fa98480bd3dd2581347f9b24c9bdc..490016575d903dd89fbb21da48bf6bcf642178c4 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -161,8 +161,6 @@ public:
     #include "wx/motif/dataobj.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataobj.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dataobj.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index eef4e7b99c5861974b7adf8c1e398cfec236a0f0..1a7283aab7d9dddd83bcf64de152d50d250d4d26 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -750,8 +750,6 @@ private:
     #include "wx/gtk/dc.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/dc.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dc.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dc.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index c4de440cf10ae61ee9acd5e6466d327295db2167..63acb36e881a62d1571a6c6c6003b5fa26a85940 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/dcclient.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcclient.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dcclient.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcclient.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 338b612972d3f90123b3f7afa28b8919b324e107..0716eab54ae9c08aa0972b9b5b47e87ca217e935 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/dcmemory.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcmemory.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dcmemory.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcmemory.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 047c1cfb745254530399bde7f023366c01490e1b..d0b8f133add13541dbb6cb93d6847112edcb52c9 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/dcscreen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcscreen.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dcscreen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcscreen.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dde.h b/include/wx/dde.h
index a77e343d167e552f2fa59c0239abbceac39bb0d2..e0da0c961f41604eede2a8f9769b2b2f6d266854 100644 (file)
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -7,8 +7,6 @@
 #include "wx/motif/dde.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dde.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dde.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 4f9855a832e1a397a2b0982936b326307c95368c..923af01585e00b931485e3a2cca8c00694b504c6 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -273,7 +273,7 @@
     #error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
-      !defined(__WXQT__) && !defined(__WXMGL__) && wxUSE_GUI
+      !defined(__WXMGL__) && wxUSE_GUI
     #ifdef __UNIX__
         #error "No Target! You should use wx-config program for compilation flags!"
     #else // !Unix
@@ -603,7 +603,6 @@ enum
     wxGTK_WIN32,              // GTK on Win32
     wxGTK_OS2,                // GTK on OS/2
     wxGTK_BEOS,               // GTK on BeOS
-    wxQT,                     // Qt
     wxGEOS,                   // GEOS
     wxOS2_PM,                 // OS/2 Workplace
     wxWINDOWS,                // Windows or WfW

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index c96c015e7305c8d61d55c16a2c44b186061a956e..5485cd6390add5b5f9e3eeb4fb2a39226eec453a 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -55,8 +55,6 @@ protected:
 #elif defined(__WXMGL__)
     #include "wx/mgl/dialog.h"
 // FIXME_MGL -- belongs to wxUniv
-#elif defined(__WXQT__)
-    #include "wx/qt/dialog.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dialog.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 6ac8eb2c0cd8789d4fa4a89c50006c0513e900f7..00a314639b2a6cbbb23c007f55ef20518f6ca759 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -21,8 +21,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
 #ifdef __DARWIN__
 #include "wx/generic/dirdlgg.h"

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 23530a666d833ea2cd3b6e28f83d5ed2ff59218a..20d34cd6bc4647e227c61da8a542aa8275966a5d 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -188,8 +188,6 @@ protected:
     #include "wx/motif/dnd.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dnd.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index 8a3ff7c33ef0f9859c97a3a76d299ffd78a086db..63ab20c64d32b8f4a859f7acc5d61ae840af0932 100644 (file)
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -22,11 +22,6 @@
 #define wxDragImage wxGenericDragImage
 #define sm_classwxDragImage sm_classwxGenericDragImage
 
-#elif defined(__WXQT__)
-#include "wx/generic/dragimgg.h"
-#define wxDragImage wxGenericDragImage
-#define sm_classwxDragImage sm_classwxGenericDragImage
-
 #elif defined(__WXMAC__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index a051d309f5012d6b078c333d90a5913f3e5c277f..6b917aa5ae7feb84c64bf279ac16ad67f483139b 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -20,8 +20,6 @@ enum
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/filedlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/filedlg.h"
 #elif defined(__WXMAC__)
 #ifdef __DARWIN__
 #include "wx/generic/filedlgg.h"

diff --git a/include/wx/font.h b/include/wx/font.h
index 1aad6d9172ffb80e4495f80385d862ac14611f60..12ce162da7dad87bdc1f4ab4577d36fbe9982a5c 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -163,8 +163,6 @@ private:
     #include "wx/gtk/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/font.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/font.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index b468392fac0eb63b7fde66a2b37e560e5c749ba9..801dab194354263a08351171f8c2b0cd5a61efe4 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -86,8 +86,6 @@ protected:
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 7acc57009799691fca09b5aa7f436fb14573e1de..a5bf86c00c404c4ad5f1f8b1df724bdc96a1c5d4 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/gdiobj.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/gdiobj.h"
-#elif defined(__WXQT__)
-#include "wx/qt/gdiobj.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/gdiobj.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 2385447aab552552e2468034820a821f5af75358..6b21c5060413b289d821b3c3241ebda46b010e5d 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -7,8 +7,6 @@
 #include "wx/motif/glcanvas.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/glcanvas.h"
-#elif defined(__WXQT__)
-#include "wx/qt/glcanvas.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 609c8c42c28b07b63c27e2ae5092b5130584c2bf..1632b1a03fe928d00a56984da383c290fdee6389 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -15,8 +15,6 @@
   #include "wx/gtk/icon.h"
 #elif defined(__WXMGL__)
   #include "wx/mgl/icon.h"
-#elif defined(__WXQT__)
-  #include "wx/qt/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 662a953a6fc81a339ad019770ef43929847bcf60..afe6348038eec94a85bdd781a979ab143dda383b 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -133,8 +133,6 @@ protected:
     #include "wx/motif/listbox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/listbox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/listbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 40d7abf66c5f8d68d63728ad923824ebcbcce7d5..2eae5377914b2897b608f4656805acca6f26865f 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -7,8 +7,6 @@
 #include "wx/motif/mdi.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
-#elif defined(__WXQT__)
-#include "wx/qt/mdi.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/mdi.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 0ffe2447a99e7a70956e936326a6f7e3a5ac7f70..54d5dca36fd27294d744acd9f627fd1ef46e512f 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -451,8 +451,6 @@ protected:
     #include "wx/motif/menu.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/menu.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/menu.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menu.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 6d1c9872cfaec23a2494ee368ab0f6de9a5ed022..9a74c6e07e81ee61fa2f5233ac636c26829fcb17 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -140,8 +140,6 @@ private:
     #include "wx/motif/menuitem.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/menuitem.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/menuitem.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 02e43e1f0b761360ac0b943770ba39b46e1ba412..58ce76e40a71193c0ff26ba8533cd095ad09f8f4 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -11,8 +11,6 @@
 #include "wx/motif/msgdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 0a05ec91203e4cf2dac383f7d6df50c6d5d76806..b9633705e7cb890d564783e11bf71d456d10388d 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -273,8 +273,6 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     #include  "wx/generic/notebook.h"
 #elif defined(__WXGTK__)
     #include  "wx/gtk/notebook.h"
-#elif defined(__WXQT__)
-    #include  "wx/qt/notebook.h"
 #elif defined(__WXMAC__)
     #include  "wx/mac/notebook.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 84f6bd8151fae083c2956aa59e131433d6837696..a09f55dc321bcfde167c6819d2caae5a5a243908 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -9,8 +9,6 @@
 #include "wx/generic/paletteg.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/palette.h"
-#elif defined(__WXQT__)
-#include "wx/qt/palette.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/palette.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 0067885a4041b763dafd8e2f8c0ac158f5520c41..5cef9c390e9a6d58af81e94a878caaf9803709e7 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/pen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
-#elif defined(__WXQT__)
-#include "wx/qt/pen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pen.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 778488ca6be788ee117ee4b5d766a123974d68d9..7260859147df37171e75b05177602d8979598eb7 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -7,8 +7,6 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/generic/prntdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/printdlg.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 33924706a48bd2b1a081d5c94923c04adfcdf3da..caa8fbbe9160a3af0550286a0a8ccf091036d361 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -102,8 +102,6 @@ public:
     #include "wx/motif/radiobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index f2ed555db52e9f9d998334f376c43ce4c96e5326..2181ce68c4ca2209646e44b38ecee32ab8434d8a 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -41,8 +41,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
     #include "wx/motif/radiobut.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobut.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/radiobut.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobut.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/region.h b/include/wx/region.h
index f0c7d86ad18493b50c91d90fcf2ddb42cf515f7e..fc75ad05eb20fcc905be09b4ab6cd7ff113a8e74 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -9,8 +9,6 @@
 #include "wx/gtk/region.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/region.h"
-#elif defined(__WXQT__)
-#include "wx/qt/region.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/region.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index f995c03e5a63a0c3dca52a4ef13ba3cdebb6d0eb..a4b86f01036fdd32d8aa3a9157f868a2df4dd449 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -46,8 +46,6 @@ public:
     #include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/scrolbar.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/scrolbar.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 7858b6d68f93a4c47d08a30e4c5d940782622adf..14b487a92a437ae10a5891a336f9c5d3fb670fe9 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -114,8 +114,6 @@
 #include "wx/gtk/settings.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/settings.h"
-#elif defined(__WXQT__)
-#include "wx/qt/settings.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/settings.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/setup.h b/include/wx/setup.h
index a4bf2e32c5223b284e0cd50f9ed247741cc0b704..e6bfe68c4f514be2844754d11d6c7e6c67fac680 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -11,8 +11,8 @@
 
 /* compatibility code, to be removed asap: */
 
-#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
-#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
+#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__
 #endif
 
 /*
@@ -40,13 +40,6 @@
 #elif defined(__WXMAC__)
 #include "wx/mac/setup.h"
 
-#elif defined(__WXQT__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/qtd/setup.h"
-#else
-#include "wx/qt/setup.h"
-#endif
-
 #elif defined(__WXMOTIF__)
 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/motifd/setup.h"

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 3f09b67dd0f5ccdf1ef1eeb6822de77086e36fa1..cc0a5b61a55347ea031188428fe1a25013a38a98 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -98,8 +98,6 @@ public:
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/slider.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/slider.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/slider.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index e2c4fd53d626c7732afb0e275787a512cafc0d1d..52928d24d44575c12f52e7af2df2edab57741771 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -82,8 +82,6 @@ protected:
     #include "wx/motif/spinbutt.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/spinbutt.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/spinbutt.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index b029e5833a2e494aa0e0c98b1a212c82ca7ac057..93f26e79245c927ddccabe604330a0d19dbf2971 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -54,8 +54,6 @@ protected:
     #include "wx/motif/statbmp.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statbmp.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 3edf096c1ef6739e304f8c40bedd73a577e1f89b..188abffa6701a04122548fb81bfa7acdff57fa83 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -26,8 +26,6 @@ public:
 #include "wx/motif/statbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbox.h"
-#elif defined(__WXQT__)
-#include "wx/qt/statbox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/statbox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 4df4158dc0a85553d355bfed509f562f4980c9df..0eb58a33979cf35e14d067f4c5aa039ce605cebd 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -22,8 +22,6 @@ public:
     #include "wx/motif/stattext.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/stattext.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/stattext.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/stattext.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 3474858a655766de631a06921d7f10af4a6799e0..8a212f71f4111b7729f0a2eaff84ac7f2c9c5d41 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -6,7 +6,6 @@
 #elif defined(__WXMOTIF__)
 #include "wx/motif/taskbar.h"
 #elif defined(__WXGTK__)
-#elif defined(__WXQT__)
 #elif defined(__WXMAC__)
 #include "wx/mac/taskbar.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 1114db36a7b4a410a631160498f9caf8d09233ce..d0b8ad3ff750140632e4c83d64d3d21dec3513f9 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -273,8 +273,6 @@ private:
     #include "wx/motif/textctrl.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/textctrl.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/textctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/textctrl.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 009df2910c71504718df7281c06e4dd90ac38325..e0d53e661e2c1d8d2ad61863c77520b6125908e7 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -33,8 +33,6 @@ END_DECLARE_EVENT_TYPES()
 /*
 # elif defined(__WXMOTIF__)
 #  include "wx/motif/tglbtn.h"
-# elif defined(__WXQT__)
-#  include "wx/qt/tglbtn.h"
 # elif defined(__WXMAC__)
 #  include "wx/mac/tglbtn.h"
 # elif defined(__WXPM__)

diff --git a/include/wx/timer.h b/include/wx/timer.h
index ae1da9917b6309c49679436a61e0959ce49732c0..c7459e915296ed7f6bc2a89d2c831655f2ce2d8d 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -111,8 +111,6 @@ protected:
     #include "wx/gtk/timer.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/timer.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/timer.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index ac9bbc5c1815cc5f4f792128bddcd49602273ce1..e7872223aa5b6d9f0c21deec32dbf3ccd8fe2ea7 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -43,8 +43,6 @@
            #include "wx/motif/toolbar.h"
         #elif defined(__WXGTK__)
            #include "wx/gtk/tbargtk.h"
-        #elif defined(__WXQT__)
-           #include "wx/qt/tbarqt.h"
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 017bed7de195181b66b3d79eff17c6395b698768..3f23431543b09b3a2b3e302edf1cc4e0ae96d658 100644 (file)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -7,8 +7,6 @@
 // #include "wx/motif/tooltip.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tooltip.h"
-#elif defined(__WXQT__)
-#include "wx/qt/tooltip.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 4c720bb17f40c4e4267683621d2bb275b674f156..8b5b215034101e6686a5bed2f72b5cc3129479eb 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -19,8 +19,6 @@
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/treectrl.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/wave.h b/include/wx/wave.h
index 8a31835ed44eb8564f9a78b57c57e927affcecb8..e9aaa5a8883fc57f60a96142d74b8c4953b4abbc 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -5,8 +5,6 @@
 #include "wx/msw/wave.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/wave.h"
-#elif defined(__WXQT__)
-#include "wx/qt/wave.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/wave.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/window.h b/include/wx/window.h
index 6e3e82e943071ea07b9267101f949f7a235b88e8..2e940e1ddd7863392a6130f1b9130a5cec2fcab2 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1019,8 +1019,6 @@ private:
         #define sm_classwxWindowMGL sm_classwxWindow
     #endif // wxUniv
     #include "wx/mgl/window.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/window.h"
 #elif defined(__WXMAC__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMac

diff --git a/wxGTK.spec b/wxGTK.spec
index bbf85644ad6c9d849aa84573aae24b9d84a0527d..3da722f28234665f2662a52c549c31713593a4ed 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -16,7 +16,7 @@ BuildRoot: /var/tmp/%{name}-root
 
 # all packages providing an implementation of wxWindows library (regardless of
 # the toolkit used) should provide the (virtual) wxwin package, this makes it
-# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
+# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 Provides: wxwin
 
 # in addition, we should provide libwx_gtk as automatic generator only notices

diff --git a/wxMotif.spec b/wxMotif.spec
index eac2686eadd34407fbbfaa7db95dc9e4e2be21de..82b111a7aab59775afe92abf5547295f524580bc 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -19,7 +19,7 @@ BuildRoot: /tmp/wxmotif_root
 
 # all packages providing an implementation of wxWindows library (regardless of
 # the toolkit used) should provide the (virtual) wxwin package, this makes it
-# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
+# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 Provides: wxwin
 
 %description