From b4e76e0d7e4c1be878e125df31dc9370bb0fa99e Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 7 Aug 1998 20:23:17 +0000 Subject: [PATCH] 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 | 2 ++ include/wx/bitmap.h | 2 ++ include/wx/bmpbuttn.h | 2 ++ include/wx/brush.h | 2 ++ include/wx/button.h | 2 ++ include/wx/checkbox.h | 2 ++ include/wx/choice.h | 2 ++ include/wx/clipbrd.h | 2 ++ include/wx/colordlg.h | 2 ++ include/wx/combobox.h | 2 ++ include/wx/control.h | 2 ++ include/wx/cursor.h | 2 ++ include/wx/dc.h | 2 ++ include/wx/dcclient.h | 2 ++ include/wx/dcmemory.h | 2 ++ include/wx/dcscreen.h | 2 ++ include/wx/dde.h | 2 ++ include/wx/defs.h | 7 +++--- include/wx/dialog.h | 2 ++ include/wx/dirdlg.h | 2 ++ include/wx/dnd.h | 2 ++ include/wx/font.h | 2 ++ include/wx/fontdlg.h | 6 +++++ include/wx/frame.h | 2 ++ include/wx/gauge.h | 2 ++ include/wx/gdiobj.h | 2 ++ include/wx/icon.h | 2 ++ include/wx/imaglist.h | 2 ++ include/wx/listbox.h | 2 ++ include/wx/listctrl.h | 2 ++ include/wx/mdi.h | 2 ++ include/wx/menu.h | 2 ++ include/wx/msgdlg.h | 2 ++ include/wx/notebook.h | 2 ++ include/wx/palette.h | 2 ++ include/wx/pen.h | 2 ++ include/wx/radiobox.h | 2 ++ include/wx/radiobut.h | 2 ++ include/wx/region.h | 2 ++ include/wx/scrolbar.h | 2 ++ include/wx/settings.h | 2 ++ include/wx/slider.h | 2 ++ include/wx/spinbutt.h | 2 ++ include/wx/statbmp.h | 2 ++ include/wx/statbox.h | 2 ++ include/wx/stattext.h | 2 ++ include/wx/textctrl.h | 2 ++ include/wx/timer.h | 2 ++ include/wx/toolbar.h | 2 ++ include/wx/treectrl.h | 2 ++ include/wx/window.h | 2 ++ install/unix/setup/setup.hin | 2 ++ src/Makefile | 2 +- src/mkdirs | 8 +++---- src/qt.inc | 45 ++++++++++++++++++++++++++++++++++++ 55 files changed, 160 insertions(+), 8 deletions(-) diff --git a/include/wx/app.h b/include/wx/app.h index c4a3d4ba43..6a92d6e28e 100644 --- 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 d1ac7ade34..2d5ad42e0c 100644 --- 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 9c5dd47316..435220473e 100644 --- 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 fd7657e4d6..f29460b1c9 100644 --- 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 b109fc41ea..096f189abc 100644 --- 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 44603e8018..70451f88a6 100644 --- 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 4bda50c2f4..a6b981d746 100644 --- 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 6dbcfe87eb..91ff846700 100644 --- 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 e3b0a04c79..d2453d9a0e 100644 --- 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 709a399e28..e5ffb31efc 100644 --- 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 b424a69cdb..e6a4b8fed2 100644 --- 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 d7e15b7620..f9dafb81a7 100644 --- 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 8b3f3230c5..b8a6344145 100644 --- 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 5db0f61273..cdd08bc9bd 100644 --- 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 204be5723f..f2cb35f398 100644 --- 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 9295477cd9..7a5c047955 100644 --- 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 765190b157..38848db1b3 100644 --- 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 f84200020c..9feafaf59c 100644 --- 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 a459bff88d..19856d0663 100644 --- 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 e1216cc9ca..5d601368cf 100644 --- 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 2dab36f0ba..c9fea4c167 100644 --- 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 bcfcccd812..84f67231a9 100644 --- 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 4d83cf4e0d..5aeb8cf6c9 100644 --- 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 82cf407fe6..2deb5f7d7f 100644 --- 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 9bf0970bfd..eeaba1a2c6 100644 --- 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 4b98003473..d018a15bce 100644 --- 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 1dbcd1443b..b5df2eff38 100644 --- 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 db6b8bdcfd..69062ef67e 100644 --- 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 582229682b..628ee83664 100644 --- 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 72f594add6..51b65a8e5e 100644 --- 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 39298703cc..1ecf988497 100644 --- 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 f845f4a5e3..a448501bb8 100644 --- 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 28587a318c..3ac1c7f9f8 100644 --- 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 92e99ec7e8..73b6f3921d 100644 --- 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 3c268a4ace..04339568b5 100644 --- 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 77c60965d9..97da9143a8 100644 --- 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 fb37c4cf48..a84da1da4d 100644 --- 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 f3278b999d..7d6708b27e 100644 --- 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 7ac6569277..c076b5a5c2 100644 --- 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 50bdbf947a..3325b9b4ee 100644 --- 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 2bccf12fbb..a81d15fc7d 100644 --- 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 2aa7485212..21ad69c143 100644 --- 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 1e0b6090a1..c961ea2c63 100644 --- 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 b7464113ee..32c1534f90 100644 --- 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 345a214307..9bd9006136 100644 --- 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 0cf342680b..0346783aaf 100644 --- 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 40508446ac..c90818f5f3 100644 --- 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 609cc33ace..65acce19da 100644 --- 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 e8ab833439..3f7abdfdea 100644 --- 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 bb4644ccff..10afdbcd42 100644 --- 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 ebc9c3ba7c..e26cbbc9b1 100644 --- 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 442eb7070c..d6bd0136e6 100644 --- 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 eb1f2ad5f1..b14fb21c30 100644 --- 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 e029963de5..349a149d09 100755 --- 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 ca67b5a075..f25c0048b6 100644 --- 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=\ \ -- 2.45.2