More work on wxQt integration, configure

  I tried notr to break anything...

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

diff --git a/include/wx/app.h b/include/wx/app.h
index c4a3d4ba43fe7e573cc6106ba56a8eae27914622..6a92d6e28e23ff80a0d739c0ee73dac280f480c0 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -27,6 +27,8 @@ typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't
 #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)
 #include "wx/xt/app.h"
+#elif defined(__WXQT__)
+#include "wx/qt/app.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/app.h"
 #endif

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index d1ac7ade347ffe9560f5a65f4ecf15cbd22f4995..2d5ad42e0c8ed1758faec87d092c1f4b9b2ad399 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -7,6 +7,8 @@
 #include "wx/xt/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
+#elif defined(__WXQT__)
+#include "wx/qt/bitmap.h"
 #endif
 
 #endif

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 9c5dd47316a82de63c6342b093e481a78d0d1562..435220473ee48b7ff96c171b4d10be0e197dd100 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -7,6 +7,8 @@
 #include "wx/xt/bmpbuttn.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bmpbuttn.h"
+#elif defined(__WXQT__)
+#include "wx/qt/bmpbuttn.h"
 #endif
 
 #endif

diff --git a/include/wx/brush.h b/include/wx/brush.h
index fd7657e4d6c73945c04037db8de7109e94184911..f29460b1c92ab6c1594c603f4e5b5cb0d3c92c72 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -7,6 +7,8 @@
 #include "wx/xt/brush.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/brush.h"
+#elif defined(__WXQT__)
+#include "wx/qt/brush.h"
 #endif
 
 #endif

diff --git a/include/wx/button.h b/include/wx/button.h
index b109fc41ead2c1dd66e6c2bfc9008f5202df0e18..096f189abc2a5748f00beee5d89ac03b8acb6b5e 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -7,6 +7,8 @@
 #include "wx/xt/button.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/button.h"
+#elif defined(__WXQT__)
+#include "wx/qt/button.h"
 #endif
 
 #endif

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 44603e80183e864f965b4f34ea1fa0f42eba114b..70451f88a668f391f0bdb56e6505c2f42b8cf1c0 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -7,6 +7,8 @@
 #include "wx/xt/checkbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/checkbox.h"
+#elif defined(__WXQT__)
+#include "wx/qt/checkbox.h"
 #endif
 
 #endif

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 4bda50c2f482af6e19447df9039f8147d80654a5..a6b981d746f06060e96bc82c4030a014ffacac1f 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -7,6 +7,8 @@
 #include "wx/xt/choice.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/choice.h"
+#elif defined(__WXQT__)
+#include "wx/qt/choice.h"
 #endif
 
 #endif

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 6dbcfe87eb0100302f867a06b1a951212c3fae5c..91ff8467002002f5cbde1828a96a029daa7cce9c 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -7,6 +7,8 @@
 #include "wx/xt/clipbrd.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/clipbrd.h"
+#elif defined(__WXQT__)
+#include "wx/gtk/clipbrd.h"
 #endif
 
 #endif

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index e3b0a04c79f627716cf07aa633f9e7fa94d57170..d2453d9a0ef8d138c94e22a1248af4a77bdec1fd 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -7,6 +7,8 @@
 #include "wx/generic/colrdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/colrdlgg.h"
+#elif defined(__WXQT__)
+#include "wx/generic/colrdlgg.h"
 #endif
 
 #endif

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 709a399e2834e33a1a2f4c09b546b1f4d0fcb31a..e5ffb31efc7db2d0100dbf58408866ab238145a4 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -7,6 +7,8 @@
 #include "wx/xt/combobox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/combobox.h"
+#elif defined(__WXQT__)
+#include "wx/qt/combobox.h"
 #endif
 
 #endif

diff --git a/include/wx/control.h b/include/wx/control.h
index b424a69cdb0b298846c0dc3af676b2d35af7a45f..e6a4b8fed2d5796edc931f127939c7d6788bad23 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -7,6 +7,8 @@
 #include "wx/xt/control.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/control.h"
+#elif defined(__WXQT__)
+#include "wx/qt/control.h"
 #endif
 
 #endif

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index d7e15b76208cec253d713248ae0e21c52eaea79f..f9dafb81a7cd6fdcebe2bdb6e53aba2d7d49df85 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -7,6 +7,8 @@
 #include "wx/xt/cursor.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
+#elif defined(__WXQT__)
+#include "wx/qt/cursor.h"
 #endif
 
 #endif

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 8b3f3230c504828f9228f6f6498d9407f72ca34e..b8a6344145f6d4b3ca682bb1ebd745387a38e7d7 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dc.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dc.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dc.h"
 #endif
 
 #endif

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 5db0f6127382e7b5fb7af27aed9c59c819c8edc1..cdd08bc9bdd3ede626fc80df9b77af46402021ee 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dcclient.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcclient.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dcclient.h"
 #endif
 
 #endif

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 204be5723f300db72a2baabce5a4b28661f27c22..f2cb35f3988a8b36987e69e664b95ceea7bb5681 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dcmemory.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dcmemory.h"
 #endif
 
 #endif

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 9295477cd9719b86f840e78a41b50f80e3cc0337..7a5c047955073ec7c33615e53626eef54ec4d5a6 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dcscreen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcscreen.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dcscreen.h"
 #endif
 
 #endif

diff --git a/include/wx/dde.h b/include/wx/dde.h
index 765190b157e17b9b71c95c26358faa261452929c..38848db1b3e78f5f82972b10cf5f43119f819c44 100644 (file)
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dde.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dde.h"
 #endif
 
 #endif

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f84200020c3ff87565619f9c586c09d47be4e4d2..9feafaf59c0f2129cf9becd4cedc4e9d4e506f0f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -70,11 +70,12 @@
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
-#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__MAC__) && !defined(__X__)
-#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__]"
+#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
+      !defined(__MAC__) && !defined(__X__) && !defined(__WXQT__)
+#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__|__QT__]"
 #endif
 
-#if defined(__WXMOTIF__) || defined(__WXGTK__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__)
 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index a459bff88d77fb7b7bf5bc67c6163e2faca51ad3..19856d0663415f780a941f373a936b696cc388b2 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dialog.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dialog.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dialog.h"
 #endif
 
 #endif

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index e1216cc9ca0c2ca8e1562062b5638ec808a21248..5d601368cf383899c3e203228101f9dd62ead07a 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -7,6 +7,8 @@
 #include "wx/xt/dirdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dirdlg.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dirdlg.h"
 #endif
 
 #endif

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 2dab36f0babea36398c564c22830dbf9fd4a979a..c9fea4c1678eb747be2fd422a6c6c1a131210e07 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -8,6 +8,8 @@
 #elif defined(__WXMOTIF__)
 #elif defined(__WXGTK__)
 #include "wx/gtk/dnd.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dnd.h"
 #endif
 
 #endif

diff --git a/include/wx/font.h b/include/wx/font.h
index bcfcccd8129d2ef1fe35505b2247056794893804..84f67231a9d03a53aa71545ef4a9595c686b455d 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -7,6 +7,8 @@
 #include "wx/xt/font.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/font.h"
+#elif defined(__WXQT__)
+#include "wx/qt/font.h"
 #endif
 
 #endif

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 4d83cf4e0d33197089e7cc50bfca01d8c5d21f93..5aeb8cf6c965c409d05dee822412723952995d50 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -5,10 +5,16 @@
 #include "wx/msw/fontdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define classwxFontDialog classwxGenericFontDialog
 #elif defined(__WXGTK__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #   define classwxFontDialog classwxGenericFontDialog
+#elif defined(__WXQT__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define classwxFontDialog classwxGenericFontDialog
 #endif
 
 #endif

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 82cf407fe67393a67d393053db5b953a64f0520b..2deb5f7d7fb2ae3230038c06e7d89ea1cc2564bc 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -7,6 +7,8 @@
 #include "wx/xt/frame.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"
+#elif defined(__WXQT__)
+#include "wx/qt/frame.h"
 #endif
 
 #endif

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 9bf0970bfd929588b4f98ea898314fb711e085f7..eeaba1a2c63bf4e1368eee118b7e173d6bcb9803 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -7,6 +7,8 @@
 #include "wx/xt/gauge.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gauge.h"
+#elif defined(__WXQT__)
+#include "wx/qt/gauge.h"
 #endif
 
 #endif

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 4b980034733a501d222b9838d66f7e5c5dba4355..d018a15bce7d180bc34590fd3649ad92dbfd834b 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -7,6 +7,8 @@
 #include "wx/xt/gdiobj.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
+#elif defined(__WXQT__)
+#include "wx/qt/gdiobj.h"
 #endif
 
 #endif

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 1dbcd1443ba13c52ead1d518b9d530f2b86c0d9f..b5df2eff3811d5a19f36ebdeafb56674ca03dd06 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -7,6 +7,8 @@
 #include "wx/xt/icon.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/icon.h"
+#elif defined(__WXQT__)
+#include "wx/qt/icon.h"
 #endif
 
 #endif

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index db6b8bdcfd201bdc40e03eb631e8523a4d9fdf5e..69062ef67e563ff55b5cd1f0601f3b192ec8a193 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -7,6 +7,8 @@
 #include "wx/generic/imaglist.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/imaglist.h"
+#elif defined(__WXQT__)
+#include "wx/generic/imaglist.h"
 #endif
 
 #endif

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 582229682bdb9902581447dbcbe84e031ff6a204..628ee836641e70017646bbaaa43d9fb3965435e5 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -7,6 +7,8 @@
 #include "wx/xt/listbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/listbox.h"
+#elif defined(__WXQT__)
+#include "wx/qt/listbox.h"
 #endif
 
 #endif

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 72f594add6583b30087e68c562de61be05a040ad..51b65a8e5eb9384aa36039ff8ea95cd72840560c 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -7,6 +7,8 @@
 #include "wx/generic/listctrl.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/listctrl.h"
+#elif defined(__WXQT__)
+#include "wx/generic/listctrl.h"
 #endif
 
 #endif

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 39298703ccfe5bf7fcdd347745aaa41c258f4aa1..1ecf988497fb34c022d1d9bcf9af8e4a4000c491 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -7,6 +7,8 @@
 #include "wx/xt/mdi.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
+#elif defined(__WXQT__)
+#include "wx/qt/mdi.h"
 #endif
 
 #endif

diff --git a/include/wx/menu.h b/include/wx/menu.h
index f845f4a5e37c105456dfdcaf38a947e7b29fe21f..a448501bb8dd755aea3a23f7dfd14bb5d122d216 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -7,6 +7,8 @@
 #include "wx/xt/menu.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/menu.h"
+#elif defined(__WXQT__)
+#include "wx/qt/menu.h"
 #endif
 
 #endif

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 28587a318cc0a9a14a9bd05835247317e7a6a74f..3ac1c7f9f8eb2bf7bc4506b328a5202fb1e147fb 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -7,6 +7,8 @@
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
+#elif defined(__WXQT__)
+#include "wx/generic/msgdlgg.h"
 #endif
 
 #endif

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 92e99ec7e8d9d7042be51559f61749675c2515ce..73b6f3921db0e818d6da9267b87e93e3b62de54b 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -7,6 +7,8 @@
   #error "wxNotebook not implemented under Motif"
 #elif defined(__WXGTK__)
   #include  "wx/gtk/notebook.h"
+#elif defined(__WXQT__)
+  #include  "wx/qt/notebook.h"
 #endif
 
 #endif

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 3c268a4ace74f9cee023b4bce34092049bcd5d09..04339568b5899e4509a43c27204fd003ca6a7258 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -7,6 +7,8 @@
 #include "wx/xt/palette.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/palette.h"
+#elif defined(__WXQT__)
+#include "wx/qt/palette.h"
 #endif
 
 #endif

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 77c60965d94355e1654880cc6009c4aa6ac13cc4..97da9143a8f8d548d1e0c39a85574d7d4bb94e11 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -7,6 +7,8 @@
 #include "wx/xt/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
+#elif defined(__WXQT__)
+#include "wx/qt/pen.h"
 #endif
 
 #endif

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index fb37c4cf4898ac2dda923d85cace31d1bb7161b4..a84da1da4d367d0b03a81ea70730c0d4092b8035 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -7,6 +7,8 @@
 #include "wx/xt/radiobox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobox.h"
+#elif defined(__WXQT__)
+#include "wx/qt/radiobox.h"
 #endif
 
 #endif

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index f3278b999d209b705a082556a7d16935d202077c..7d6708b27e72e5aea2dcda5bf9c34ce22a35ea51 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -7,6 +7,8 @@
 #include "wx/xt/radiobut.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobut.h"
+#elif defined(__WXQT__)
+#include "wx/qt/radiobut.h"
 #endif
 
 #endif

diff --git a/include/wx/region.h b/include/wx/region.h
index 7ac65692774e8cb48def6554069123a98d06c920..c076b5a5c26b30abecbb8fd7f44227addd252858 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -7,6 +7,8 @@
 #include "wx/xt/region.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/region.h"
+#elif defined(__WXQT__)
+#include "wx/qt/region.h"
 #endif
 
 #endif

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 50bdbf947a9d4d48ba6ba8ca865a33278be93976..3325b9b4eee1907fdca05a3683f904781e785184 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -7,6 +7,8 @@
 #include "wx/xt/scrolbar.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/scrolbar.h"
+#elif defined(__WXQT__)
+#include "wx/qt/scrolbar.h"
 #endif
 
 #endif

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 2bccf12fbb7e87be7a122e5aabe4e559121b4469..a81d15fc7d0b17e728f130d54e8902aa9fde0d90 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -110,6 +110,8 @@
 #include "wx/xt/settings.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/settings.h"
+#elif defined(__WXQT__)
+#include "wx/qt/settings.h"
 #endif
 
 #endif

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 2aa7485212af8887bfd14b56e9ae3cc915caebd9..21ad69c143042b248bccd840fa574ad8d93643b4 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -7,6 +7,8 @@
 #include "wx/xt/slider.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/slider.h"
+#elif defined(__WXQT__)
+#include "wx/qt/slider.h"
 #endif
 
 #endif

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 1e0b6090a1c13b47f7c8d56deea767465c807601..c961ea2c6324cfa5eb06b0d95ee8e1636166a5a2 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -7,6 +7,8 @@
 #include "wx/xt/spinbutt.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/spinbutt.h"
+#elif defined(__WXQT__)
+#include "wx/qt/spinbutt.h"
 #endif
 
 #endif

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index b7464113ee8c7c92953d59f304f7ec2ef3ef27e0..32c1534f90d38a35c52d7e87f49d53c825755255 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -7,6 +7,8 @@
 #include "wx/xt/statbmp.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbmp.h"
+#elif defined(__WXQT__)
+#include "wx/qt/statbmp.h"
 #endif
 
 #endif

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 345a2143071bdf89be6e5a0e09d71eda7800aeb0..9bd9006136021973cc8a18e36880036e39b3e454 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -7,6 +7,8 @@
 #include "wx/xt/statbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbox.h"
+#elif defined(__WXQT__)
+#include "wx/qt/statbox.h"
 #endif
 
 #endif

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0cf342680b8da237c2b892bb6e8f444b71f12815..0346783aaf7aac73bbc1743f7a637c91053da4c2 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -7,6 +7,8 @@
 #include "wx/xt/stattext.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/stattext.h"
+#elif defined(__WXQT__)
+#include "wx/qt/stattext.h"
 #endif
 
 #endif

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 40508446ac42d277184d73b7a4fbcb123813179d..c90818f5f3348bb771dd90447df034afefcadc3f 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -7,6 +7,8 @@
 #include "wx/xt/textctrl.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/textctrl.h"
+#elif defined(__WXQT__)
+#include "wx/qt/textctrl.h"
 #endif
 
 #endif

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 609cc33ace3daff794af8353eb35bf305a50e41e..65acce19da2247505e884826c32f9bcbb519d28b 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -7,6 +7,8 @@
 #include "wx/xt/timer.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/timer.h"
+#elif defined(__WXQT__)
+#include "wx/qt/timer.h"
 #endif
 
 #endif

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index e8ab833439315b5b6735a5d20f4b542ba7fc35ef..3f7abdfdea1999c46512f3e15d1fd1cdbb39b2e8 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -13,6 +13,8 @@
 #   define classwxToolBar classwxToolBarMSW
 #elif defined(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"
+#elif defined(__WXQT__)
+#   include "wx/qt/tbargtk.h"
 #endif
 
 #endif

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index bb4644ccff790c7518cbffa404a511615bbede2d..10afdbcd4240894c82cb8fada227f7c20a4fc5b6 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -7,6 +7,8 @@
 #include "wx/generic/treectrl.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/treectrl.h"
+#elif defined(__WXQT__)
+#include "wx/generic/treectrl.h"
 #endif
 
 #endif

diff --git a/include/wx/window.h b/include/wx/window.h
index ebc9c3ba7c23ffdf12cbff66bac79d94e082a98d..e26cbbc9b1beefcf64f1848c71de66377658fcea 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -7,6 +7,8 @@
 #include "wx/xt/window.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/window.h"
+#elif defined(__WXQT__)
+#include "wx/qt/window.h"
 #endif
 
 #endif

diff --git a/install/unix/setup/setup.hin b/install/unix/setup/setup.hin
index 442eb7070c9959983f253541e1f1e5d3425242f9..d6bd0136e64574b3907b209a61d8d3e9fd777729 100644 (file)
--- a/install/unix/setup/setup.hin
+++ b/install/unix/setup/setup.hin
@@ -22,6 +22,8 @@
 
 /* define the system to compile */
 #undef __WXGTK__
+#undef __WXMOTIF__
+#undef __WXQT__
 #undef __UNIX__
 #undef __LINUX__
 #undef __SGI__

diff --git a/src/Makefile b/src/Makefile
index eb1f2ad5f1f29eb22fd3bd6cb8b1ecc1d8c3198c..b14fb21c3040764b64624f75d8878d90ab9c3737 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1 +1 @@
-include gtk/setup/general/makeapp
+include ../install/unix/setup/general/makeapp

diff --git a/src/mkdirs b/src/mkdirs
index e029963de54c4a74162b5a18a695b2daa4248ed8..349a149d095761dae6b89fcb9cf9b3e9b4524d12 100755 (executable)
--- a/src/mkdirs
+++ b/src/mkdirs
@@ -6,13 +6,13 @@ if test ! -d gtk; then
 fi
 
 # create "/qt" if not present
-if test ! -d gtk; then
-    mkdir gtk
+if test ! -d qt; then
+    mkdir qt
 fi
 
 # create "/motif" if not present
-if test ! -d gtk; then
-    mkdir gtk
+if test ! -d motif; then
+    mkdir motif
 fi
 
 # create "/common" if not present

diff --git a/src/qt.inc b/src/qt.inc
index ca67b5a0755360a52e9577422c5271786bdbbdbd..f25c0048b6432024608ba40a942bc2e39fad0106 100644 (file)
--- a/src/qt.inc
+++ b/src/qt.inc
@@ -10,6 +10,51 @@ LIB_MINOR=1
 
 LIB_CPP_SRC=\
 \
+ qt/app.cpp \
+ qt/bitmap.cpp \
+ qt/brush.cpp \
+ qt/button.cpp \
+ qt/checkbox.cpp \
+ qt/choice.cpp \
+ qt/colour.cpp \
+ qt/control.cpp \
+ qt/combobox.cpp \
+ qt/cursor.cpp \
+ qt/data.cpp \
+ qt/dc.cpp \
+ qt/dcclient.cpp \
+ qt/dcmemory.cpp \
+ qt/dcscreen.cpp \
+ qt/dnd.cpp \
+ qt/dialog.cpp \
+ qt/filedlg.cpp \
+ qt/font.cpp \
+ qt/frame.cpp \
+ qt/gauge.cpp \
+ qt/gdiobj.cpp \
+ qt/icon.cpp \
+ qt/listbox.cpp \
+ qt/mdi.cpp \
+ qt/menu.cpp \
+ qt/notebook.cpp \
+ qt/palette.cpp \
+ qt/pen.cpp \
+ qt/radiobox.cpp \
+ qt/radiobut.cpp \
+ qt/region.cpp \
+ qt/scrolbar.cpp \
+ qt/settings.cpp \
+ qt/slider.cpp \
+ qt/statbox.cpp \
+ qt/stattext.cpp \
+ qt/tbargtk.cpp \
+ qt/textctrl.cpp \
+ qt/timer.cpp \
+ qt/utilsgtk.cpp \
+ qt/utilsres.cpp \
+ qt/window.cpp \
+\
+
  
 LIB_C_SRC=\
 \