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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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