diff --git a/Makefile.in b/Makefile.in
index 0aaf0d00fe..91313b3c09 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2223,6 +2223,7 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM =  \
 @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
 @COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
 @COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
+@COND_TOOLKIT_Qt@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
 @COND_TOOLKIT_WINCE@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
 @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h
@@ -2750,6 +2751,88 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR = 
 @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = 
 @COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = 
+COND_TOOLKIT_QT_LOWLEVEL_HDR =  \
+	wx/qt/accel.h \
+	wx/qt/app.h \
+	wx/qt/apptbase.h \
+	wx/qt/apptrait.h \
+	wx/qt/bitmap.h \
+	wx/qt/bmpbuttn.h \
+	wx/qt/brush.h \
+	wx/qt/anybutton.h \
+	wx/qt/button.h \
+	wx/qt/checkbox.h \
+	wx/qt/checklst.h \
+	wx/qt/choice.h \
+	wx/qt/clipbrd.h \
+	wx/qt/clrpicker.h \
+	wx/qt/generic/clrpickerg.h \
+	wx/generic/collpaneg.h \
+	wx/qt/colordlg.h \
+	wx/qt/colour.h \
+	wx/qt/combobox.h \
+	wx/qt/control.h \
+	wx/qt/converter.h \
+	wx/qt/ctrlsub.h \
+	wx/qt/cursor.h \
+	wx/qt/dataform.h \
+	wx/qt/dataobj2.h \
+	wx/qt/dataobj.h \
+	wx/qt/dcclient.h \
+	wx/qt/dc.h \
+	wx/qt/dcmemory.h \
+	wx/qt/dcprint.h \
+	wx/qt/dcscreen.h \
+	wx/qt/defs.h \
+	wx/qt/dialog.h \
+	wx/qt/dirdlg.h \
+	wx/qt/dnd.h \
+	wx/qt/evtloop.h \
+	wx/qt/filedlg.h \
+	wx/qt/font.h \
+	wx/qt/fontdlg.h \
+	wx/qt/frame.h \
+	wx/qt/gauge.h \
+	wx/generic/icon.h \
+	wx/generic/imaglist.h \
+	wx/qt/listbox.h \
+	wx/qt/listctrl.h \
+	wx/qt/mdi.h \
+	wx/qt/menu.h \
+	wx/qt/menuitem.h \
+	wx/qt/minifram.h \
+	wx/qt/msgdlg.h \
+	wx/qt/notebook.h \
+	wx/qt/palette.h \
+	wx/qt/pen.h \
+	wx/qt/popupwin.h \
+	wx/qt/printdlg.h \
+	wx/generic/prntdlgg.h \
+	wx/qt/printqt.h \
+	wx/qt/radiobox.h \
+	wx/qt/radiobut.h \
+	wx/qt/region.h \
+	wx/qt/scrolbar.h \
+	wx/qt/slider.h \
+	wx/qt/spinbutt.h \
+	wx/qt/spinctrl.h \
+	wx/qt/statbmp.h \
+	wx/qt/statbox.h \
+	wx/qt/statline.h \
+	wx/qt/statusbar.h \
+	wx/qt/stattext.h \
+	wx/qt/textctrl.h \
+	wx/qt/textdlg.h \
+	wx/qt/textentry.h \
+	wx/qt/tglbtn.h \
+	wx/qt/timer.h \
+	wx/qt/toolbar.h \
+	wx/qt/tooltip.h \
+	wx/qt/toplevel.h \
+	wx/qt/utils.h \
+	wx/qt/window.h \
+	wx/qt/private/winevent.h
+@COND_TOOLKIT_QT@LOWLEVEL_HDR = $(COND_TOOLKIT_QT_LOWLEVEL_HDR)
 COND_TOOLKIT_WINCE_LOWLEVEL_HDR =  \
 	wx/msw/nonownedwnd.h \
 	wx/msw/ole/activex.h \
@@ -3544,6 +3627,7 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR =  \
 	wx/osx/carbon/uma.h \
 	wx/generic/region.h
 @COND_TOOLKIT_OSX_IPHONE@GUI_HDR = $(COND_TOOLKIT_OSX_IPHONE_GUI_HDR)
+@COND_TOOLKIT_QT@GUI_HDR = 
 COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/generic/clrpickerg.h \
 	wx/generic/collpaneg.h \
@@ -3705,6 +3789,14 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR =  \
 @COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR)
 @COND_TOOLKIT_OSX_IPHONE@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_OSX_IPHONE@	wx/generic/animate.h wx/osx/sound.h
+COND_TOOLKIT_QT_ADVANCED_PLATFORM_HDR =  \
+	wx/generic/animate.h \
+	wx/qt/calctrl.h \
+	wx/qt/dataview.h \
+	wx/qt/dvrenderer.h \
+	wx/qt/dvrenderers.h \
+	wx/qt/taskbar.h
+@COND_TOOLKIT_QT@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_QT_ADVANCED_PLATFORM_HDR)
 @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_WINCE@	wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h
 @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
@@ -3860,6 +3952,7 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
 @COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_QT@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = 
 @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR)
@@ -4633,7 +4726,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_containr.o \
 	monodll_cshelp.o \
 	monodll_ctrlcmn.o \
-	monodll_ctrlsub.o \
+	monodll_common_ctrlsub.o \
 	monodll_dcbase.o \
 	monodll_dcbufcmn.o \
 	monodll_dcgraph.o \
@@ -4855,7 +4948,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_containr.o \
 	monodll_cshelp.o \
 	monodll_ctrlcmn.o \
-	monodll_ctrlsub.o \
+	monodll_common_ctrlsub.o \
 	monodll_dcbase.o \
 	monodll_dcbufcmn.o \
 	monodll_dcgraph.o \
@@ -5206,7 +5299,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_msw_textmeasure.o \
 	monodll_msw_tooltip.o \
 	monodll_msw_toplevel.o \
-	monodll_uiaction.o \
+	monodll_msw_uiaction.o \
 	monodll_utilsgui.o \
 	monodll_utilswin.o \
 	monodll_uxtheme.o \
@@ -5222,6 +5315,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS = \
 @COND_TOOLKIT_OSX_IPHONE@	$(__OSX_LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS =  \
+	monodll_qt_accel.o \
+	monodll_qt_app.o \
+	monodll_qt_apptraits.o \
+	monodll_qt_bitmap.o \
+	monodll_qt_bmpbuttn.o \
+	monodll_qt_brush.o \
+	monodll_qt_anybutton.o \
+	monodll_qt_button.o \
+	monodll_generic_caret.o \
+	monodll_qt_checkbox.o \
+	monodll_qt_checklst.o \
+	monodll_qt_choice.o \
+	monodll_qt_clipbrd.o \
+	monodll_qt_clrpicker.o \
+	monodll_clrpickerg.o \
+	monodll_collpaneg.o \
+	monodll_qt_colordlg.o \
+	monodll_qt_colour.o \
+	monodll_qt_combobox.o \
+	monodll_qt_control.o \
+	monodll_converter.o \
+	monodll_qt_ctrlsub.o \
+	monodll_qt_cursor.o \
+	monodll_qt_dataobj.o \
+	monodll_qt_dcclient.o \
+	monodll_qt_dc.o \
+	monodll_qt_dcmemory.o \
+	monodll_qt_dcprint.o \
+	monodll_qt_dcscreen.o \
+	monodll_defs.o \
+	monodll_qt_dialog.o \
+	monodll_unix_dialup.o \
+	monodll_qt_display.o \
+	monodll_qt_dnd.o \
+	monodll_qt_evtloop.o \
+	monodll_generic_fdrepdlg.o \
+	monodll_qt_filedlg.o \
+	monodll_filepickerg.o \
+	monodll_qt_font.o \
+	monodll_qt_fontdlg.o \
+	monodll_qt_fontutil.o \
+	monodll_qt_fontenum.o \
+	monodll_fontpickerg.o \
+	monodll_qt_frame.o \
+	monodll_qt_gauge.o \
+	monodll_generic_icon.o \
+	monodll_generic_imaglist.o \
+	monodll_qt_listbox.o \
+	monodll_qt_listctrl.o \
+	monodll_qt_mdi.o \
+	monodll_qt_menu.o \
+	monodll_qt_menuitem.o \
+	monodll_qt_minifram.o \
+	monodll_qt_msgdlg.o \
+	monodll_qt_notebook.o \
+	monodll_qt_palette.o \
+	monodll_qt_pen.o \
+	monodll_qt_popupwin.o \
+	monodll_qt_printdlg.o \
+	monodll_prntdlgg.o \
+	monodll_printqt.o \
+	monodll_qt_radiobox.o \
+	monodll_qt_radiobut.o \
+	monodll_qt_region.o \
+	monodll_qt_scrolbar.o \
+	monodll_qt_settings.o \
+	monodll_sockqt.o \
+	monodll_qt_slider.o \
+	monodll_qt_spinbutt.o \
+	monodll_qt_spinctrl.o \
+	monodll_qt_statbmp.o \
+	monodll_qt_statbox.o \
+	monodll_qt_statline.o \
+	monodll_qt_stattext.o \
+	monodll_qt_statusbar.o \
+	monodll_qt_textctrl.o \
+	monodll_qt_textentry.o \
+	monodll_generic_textmeasure.o \
+	monodll_qt_tglbtn.o \
+	monodll_qt_timer.o \
+	monodll_qt_toolbar.o \
+	monodll_qt_tooltip.o \
+	monodll_qt_toplevel.o \
+	monodll_qt_uiaction.o \
+	monodll_qt_utils.o \
+	monodll_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_activex.o \
 	monodll_msw_app.o \
@@ -5268,7 +5449,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_msw_textmeasure.o \
 	monodll_msw_tooltip.o \
 	monodll_msw_toplevel.o \
-	monodll_uiaction.o \
+	monodll_msw_uiaction.o \
 	monodll_utilsgui.o \
 	monodll_utilswin.o \
 	monodll_uxtheme.o \
@@ -5469,7 +5650,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
 	monodll_gtk_colordlg.o \
 	monodll_gtk_combobox.o \
 	monodll_gtk_control.o \
-	monodll_clrpicker.o \
+	monodll_gtk_clrpicker.o \
 	monodll_gtk_dialog.o \
 	monodll_fontpicker.o \
 	monodll_filepicker.o \
@@ -5524,7 +5705,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS =  \
 	monodll_gtk_colordlg.o \
 	monodll_gtk_combobox.o \
 	monodll_gtk_control.o \
-	monodll_clrpicker.o \
+	monodll_gtk_clrpicker.o \
 	monodll_gtk_dialog.o \
 	monodll_fontpicker.o \
 	monodll_filepicker.o \
@@ -5679,7 +5860,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
 	monodll_msw_spinctrl.o \
 	monodll_msw_statbmp.o \
 	monodll_msw_statbox.o \
-	monodll_statusbar.o \
+	monodll_msw_statusbar.o \
 	monodll_msw_statline.o \
 	monodll_msw_stattext.o \
 	monodll_msw_toolbar.o \
@@ -5784,6 +5965,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS =  \
 	monodll_iphone_utils.o \
 	monodll_iphone_window.o
 @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS)
+@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS = 
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
 	monodll_clrpickerg.o \
 	monodll_collpaneg.o \
@@ -5834,7 +6016,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
 	monodll_msw_spinctrl.o \
 	monodll_msw_statbmp.o \
 	monodll_msw_statbox.o \
-	monodll_statusbar.o \
+	monodll_msw_statusbar.o \
 	monodll_msw_statline.o \
 	monodll_msw_stattext.o \
 	monodll_msw_toolbar.o \
@@ -6068,7 +6250,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_msw_textmeasure.o \
 	monodll_msw_tooltip.o \
 	monodll_msw_toplevel.o \
-	monodll_uiaction.o \
+	monodll_msw_uiaction.o \
 	monodll_utilsgui.o \
 	monodll_utilswin.o \
 	monodll_uxtheme.o \
@@ -6084,6 +6266,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_1 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_1 =  \
+	monodll_qt_accel.o \
+	monodll_qt_app.o \
+	monodll_qt_apptraits.o \
+	monodll_qt_bitmap.o \
+	monodll_qt_bmpbuttn.o \
+	monodll_qt_brush.o \
+	monodll_qt_anybutton.o \
+	monodll_qt_button.o \
+	monodll_generic_caret.o \
+	monodll_qt_checkbox.o \
+	monodll_qt_checklst.o \
+	monodll_qt_choice.o \
+	monodll_qt_clipbrd.o \
+	monodll_qt_clrpicker.o \
+	monodll_clrpickerg.o \
+	monodll_collpaneg.o \
+	monodll_qt_colordlg.o \
+	monodll_qt_colour.o \
+	monodll_qt_combobox.o \
+	monodll_qt_control.o \
+	monodll_converter.o \
+	monodll_qt_ctrlsub.o \
+	monodll_qt_cursor.o \
+	monodll_qt_dataobj.o \
+	monodll_qt_dcclient.o \
+	monodll_qt_dc.o \
+	monodll_qt_dcmemory.o \
+	monodll_qt_dcprint.o \
+	monodll_qt_dcscreen.o \
+	monodll_defs.o \
+	monodll_qt_dialog.o \
+	monodll_unix_dialup.o \
+	monodll_qt_display.o \
+	monodll_qt_dnd.o \
+	monodll_qt_evtloop.o \
+	monodll_generic_fdrepdlg.o \
+	monodll_qt_filedlg.o \
+	monodll_filepickerg.o \
+	monodll_qt_font.o \
+	monodll_qt_fontdlg.o \
+	monodll_qt_fontutil.o \
+	monodll_qt_fontenum.o \
+	monodll_fontpickerg.o \
+	monodll_qt_frame.o \
+	monodll_qt_gauge.o \
+	monodll_generic_icon.o \
+	monodll_generic_imaglist.o \
+	monodll_qt_listbox.o \
+	monodll_qt_listctrl.o \
+	monodll_qt_mdi.o \
+	monodll_qt_menu.o \
+	monodll_qt_menuitem.o \
+	monodll_qt_minifram.o \
+	monodll_qt_msgdlg.o \
+	monodll_qt_notebook.o \
+	monodll_qt_palette.o \
+	monodll_qt_pen.o \
+	monodll_qt_popupwin.o \
+	monodll_qt_printdlg.o \
+	monodll_prntdlgg.o \
+	monodll_printqt.o \
+	monodll_qt_radiobox.o \
+	monodll_qt_radiobut.o \
+	monodll_qt_region.o \
+	monodll_qt_scrolbar.o \
+	monodll_qt_settings.o \
+	monodll_sockqt.o \
+	monodll_qt_slider.o \
+	monodll_qt_spinbutt.o \
+	monodll_qt_spinctrl.o \
+	monodll_qt_statbmp.o \
+	monodll_qt_statbox.o \
+	monodll_qt_statline.o \
+	monodll_qt_stattext.o \
+	monodll_qt_statusbar.o \
+	monodll_qt_textctrl.o \
+	monodll_qt_textentry.o \
+	monodll_generic_textmeasure.o \
+	monodll_qt_tglbtn.o \
+	monodll_qt_timer.o \
+	monodll_qt_toolbar.o \
+	monodll_qt_tooltip.o \
+	monodll_qt_toplevel.o \
+	monodll_qt_uiaction.o \
+	monodll_qt_utils.o \
+	monodll_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_1)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_activex.o \
 	monodll_msw_app.o \
@@ -6130,7 +6400,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_msw_textmeasure.o \
 	monodll_msw_tooltip.o \
 	monodll_msw_toplevel.o \
-	monodll_uiaction.o \
+	monodll_msw_uiaction.o \
 	monodll_utilsgui.o \
 	monodll_utilswin.o \
 	monodll_uxtheme.o \
@@ -6324,6 +6594,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS \
 @COND_TOOLKIT_OSX_IPHONE@	= monodll_animateg.o monodll_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	monodll_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+	monodll_animateg.o \
+	monodll_qt_calctrl.o \
+	monodll_converter.o \
+	monodll_qt_dataview.o \
+	monodll_dvrenderer.o \
+	monodll_dvrenderers.o \
+	monodll_unix_joystick.o \
+	monodll_unix_sound.o \
+	monodll_qt_taskbar.o \
+	monodll_taskbarcmn.o \
+	monodll_qt_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_taskbarcmn.o \
 	monodll_msw_aboutdlg.o \
@@ -6450,6 +6733,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 \
 @COND_TOOLKIT_OSX_IPHONE@	= monodll_animateg.o monodll_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	monodll_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+	monodll_animateg.o \
+	monodll_qt_calctrl.o \
+	monodll_converter.o \
+	monodll_qt_dataview.o \
+	monodll_dvrenderer.o \
+	monodll_dvrenderers.o \
+	monodll_unix_joystick.o \
+	monodll_unix_sound.o \
+	monodll_qt_taskbar.o \
+	monodll_taskbarcmn.o \
+	monodll_qt_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 	monodll_taskbarcmn.o \
 	monodll_msw_aboutdlg.o \
@@ -6482,6 +6778,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_OSX_COCOA@	= monodll_osx_cocoa_mediactrl.o
 @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS \
 @COND_TOOLKIT_OSX_IPHONE@	= monodll_osx_cocoa_mediactrl.o
+@COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_qt_mediactrl.o
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \
 @COND_TOOLKIT_WINCE@	monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
 @COND_TOOLKIT_WINCE@	monodll_mediactrl_qt.o
@@ -6777,7 +7074,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_containr.o \
 	monolib_cshelp.o \
 	monolib_ctrlcmn.o \
-	monolib_ctrlsub.o \
+	monolib_common_ctrlsub.o \
 	monolib_dcbase.o \
 	monolib_dcbufcmn.o \
 	monolib_dcgraph.o \
@@ -6999,7 +7296,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_containr.o \
 	monolib_cshelp.o \
 	monolib_ctrlcmn.o \
-	monolib_ctrlsub.o \
+	monolib_common_ctrlsub.o \
 	monolib_dcbase.o \
 	monolib_dcbufcmn.o \
 	monolib_dcgraph.o \
@@ -7350,7 +7647,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_msw_textmeasure.o \
 	monolib_msw_tooltip.o \
 	monolib_msw_toplevel.o \
-	monolib_uiaction.o \
+	monolib_msw_uiaction.o \
 	monolib_utilsgui.o \
 	monolib_utilswin.o \
 	monolib_uxtheme.o \
@@ -7366,6 +7663,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_27)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_2 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_2 =  \
+	monolib_qt_accel.o \
+	monolib_qt_app.o \
+	monolib_qt_apptraits.o \
+	monolib_qt_bitmap.o \
+	monolib_qt_bmpbuttn.o \
+	monolib_qt_brush.o \
+	monolib_qt_anybutton.o \
+	monolib_qt_button.o \
+	monolib_generic_caret.o \
+	monolib_qt_checkbox.o \
+	monolib_qt_checklst.o \
+	monolib_qt_choice.o \
+	monolib_qt_clipbrd.o \
+	monolib_qt_clrpicker.o \
+	monolib_clrpickerg.o \
+	monolib_collpaneg.o \
+	monolib_qt_colordlg.o \
+	monolib_qt_colour.o \
+	monolib_qt_combobox.o \
+	monolib_qt_control.o \
+	monolib_converter.o \
+	monolib_qt_ctrlsub.o \
+	monolib_qt_cursor.o \
+	monolib_qt_dataobj.o \
+	monolib_qt_dcclient.o \
+	monolib_qt_dc.o \
+	monolib_qt_dcmemory.o \
+	monolib_qt_dcprint.o \
+	monolib_qt_dcscreen.o \
+	monolib_defs.o \
+	monolib_qt_dialog.o \
+	monolib_unix_dialup.o \
+	monolib_qt_display.o \
+	monolib_qt_dnd.o \
+	monolib_qt_evtloop.o \
+	monolib_generic_fdrepdlg.o \
+	monolib_qt_filedlg.o \
+	monolib_filepickerg.o \
+	monolib_qt_font.o \
+	monolib_qt_fontdlg.o \
+	monolib_qt_fontutil.o \
+	monolib_qt_fontenum.o \
+	monolib_fontpickerg.o \
+	monolib_qt_frame.o \
+	monolib_qt_gauge.o \
+	monolib_generic_icon.o \
+	monolib_generic_imaglist.o \
+	monolib_qt_listbox.o \
+	monolib_qt_listctrl.o \
+	monolib_qt_mdi.o \
+	monolib_qt_menu.o \
+	monolib_qt_menuitem.o \
+	monolib_qt_minifram.o \
+	monolib_qt_msgdlg.o \
+	monolib_qt_notebook.o \
+	monolib_qt_palette.o \
+	monolib_qt_pen.o \
+	monolib_qt_popupwin.o \
+	monolib_qt_printdlg.o \
+	monolib_prntdlgg.o \
+	monolib_printqt.o \
+	monolib_qt_radiobox.o \
+	monolib_qt_radiobut.o \
+	monolib_qt_region.o \
+	monolib_qt_scrolbar.o \
+	monolib_qt_settings.o \
+	monolib_sockqt.o \
+	monolib_qt_slider.o \
+	monolib_qt_spinbutt.o \
+	monolib_qt_spinctrl.o \
+	monolib_qt_statbmp.o \
+	monolib_qt_statbox.o \
+	monolib_qt_statline.o \
+	monolib_qt_stattext.o \
+	monolib_qt_statusbar.o \
+	monolib_qt_textctrl.o \
+	monolib_qt_textentry.o \
+	monolib_generic_textmeasure.o \
+	monolib_qt_tglbtn.o \
+	monolib_qt_timer.o \
+	monolib_qt_toolbar.o \
+	monolib_qt_tooltip.o \
+	monolib_qt_toplevel.o \
+	monolib_qt_uiaction.o \
+	monolib_qt_utils.o \
+	monolib_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_2)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_activex.o \
 	monolib_msw_app.o \
@@ -7412,7 +7797,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_msw_textmeasure.o \
 	monolib_msw_tooltip.o \
 	monolib_msw_toplevel.o \
-	monolib_uiaction.o \
+	monolib_msw_uiaction.o \
 	monolib_utilsgui.o \
 	monolib_utilswin.o \
 	monolib_uxtheme.o \
@@ -7613,7 +7998,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
 	monolib_gtk_colordlg.o \
 	monolib_gtk_combobox.o \
 	monolib_gtk_control.o \
-	monolib_clrpicker.o \
+	monolib_gtk_clrpicker.o \
 	monolib_gtk_dialog.o \
 	monolib_fontpicker.o \
 	monolib_filepicker.o \
@@ -7668,7 +8053,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1 =  \
 	monolib_gtk_colordlg.o \
 	monolib_gtk_combobox.o \
 	monolib_gtk_control.o \
-	monolib_clrpicker.o \
+	monolib_gtk_clrpicker.o \
 	monolib_gtk_dialog.o \
 	monolib_fontpicker.o \
 	monolib_filepicker.o \
@@ -7823,7 +8208,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
 	monolib_msw_spinctrl.o \
 	monolib_msw_statbmp.o \
 	monolib_msw_statbox.o \
-	monolib_statusbar.o \
+	monolib_msw_statusbar.o \
 	monolib_msw_statline.o \
 	monolib_msw_stattext.o \
 	monolib_msw_toolbar.o \
@@ -7928,6 +8313,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 =  \
 	monolib_iphone_utils.o \
 	monolib_iphone_window.o
 @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1)
+@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_1 = 
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
 	monolib_clrpickerg.o \
 	monolib_collpaneg.o \
@@ -7978,7 +8364,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
 	monolib_msw_spinctrl.o \
 	monolib_msw_statbmp.o \
 	monolib_msw_statbox.o \
-	monolib_statusbar.o \
+	monolib_msw_statusbar.o \
 	monolib_msw_statline.o \
 	monolib_msw_stattext.o \
 	monolib_msw_toolbar.o \
@@ -8212,7 +8598,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_msw_textmeasure.o \
 	monolib_msw_tooltip.o \
 	monolib_msw_toplevel.o \
-	monolib_uiaction.o \
+	monolib_msw_uiaction.o \
 	monolib_utilsgui.o \
 	monolib_utilswin.o \
 	monolib_uxtheme.o \
@@ -8228,6 +8614,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_27)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_3 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_3 =  \
+	monolib_qt_accel.o \
+	monolib_qt_app.o \
+	monolib_qt_apptraits.o \
+	monolib_qt_bitmap.o \
+	monolib_qt_bmpbuttn.o \
+	monolib_qt_brush.o \
+	monolib_qt_anybutton.o \
+	monolib_qt_button.o \
+	monolib_generic_caret.o \
+	monolib_qt_checkbox.o \
+	monolib_qt_checklst.o \
+	monolib_qt_choice.o \
+	monolib_qt_clipbrd.o \
+	monolib_qt_clrpicker.o \
+	monolib_clrpickerg.o \
+	monolib_collpaneg.o \
+	monolib_qt_colordlg.o \
+	monolib_qt_colour.o \
+	monolib_qt_combobox.o \
+	monolib_qt_control.o \
+	monolib_converter.o \
+	monolib_qt_ctrlsub.o \
+	monolib_qt_cursor.o \
+	monolib_qt_dataobj.o \
+	monolib_qt_dcclient.o \
+	monolib_qt_dc.o \
+	monolib_qt_dcmemory.o \
+	monolib_qt_dcprint.o \
+	monolib_qt_dcscreen.o \
+	monolib_defs.o \
+	monolib_qt_dialog.o \
+	monolib_unix_dialup.o \
+	monolib_qt_display.o \
+	monolib_qt_dnd.o \
+	monolib_qt_evtloop.o \
+	monolib_generic_fdrepdlg.o \
+	monolib_qt_filedlg.o \
+	monolib_filepickerg.o \
+	monolib_qt_font.o \
+	monolib_qt_fontdlg.o \
+	monolib_qt_fontutil.o \
+	monolib_qt_fontenum.o \
+	monolib_fontpickerg.o \
+	monolib_qt_frame.o \
+	monolib_qt_gauge.o \
+	monolib_generic_icon.o \
+	monolib_generic_imaglist.o \
+	monolib_qt_listbox.o \
+	monolib_qt_listctrl.o \
+	monolib_qt_mdi.o \
+	monolib_qt_menu.o \
+	monolib_qt_menuitem.o \
+	monolib_qt_minifram.o \
+	monolib_qt_msgdlg.o \
+	monolib_qt_notebook.o \
+	monolib_qt_palette.o \
+	monolib_qt_pen.o \
+	monolib_qt_popupwin.o \
+	monolib_qt_printdlg.o \
+	monolib_prntdlgg.o \
+	monolib_printqt.o \
+	monolib_qt_radiobox.o \
+	monolib_qt_radiobut.o \
+	monolib_qt_region.o \
+	monolib_qt_scrolbar.o \
+	monolib_qt_settings.o \
+	monolib_sockqt.o \
+	monolib_qt_slider.o \
+	monolib_qt_spinbutt.o \
+	monolib_qt_spinctrl.o \
+	monolib_qt_statbmp.o \
+	monolib_qt_statbox.o \
+	monolib_qt_statline.o \
+	monolib_qt_stattext.o \
+	monolib_qt_statusbar.o \
+	monolib_qt_textctrl.o \
+	monolib_qt_textentry.o \
+	monolib_generic_textmeasure.o \
+	monolib_qt_tglbtn.o \
+	monolib_qt_timer.o \
+	monolib_qt_toolbar.o \
+	monolib_qt_tooltip.o \
+	monolib_qt_toplevel.o \
+	monolib_qt_uiaction.o \
+	monolib_qt_utils.o \
+	monolib_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_3)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_activex.o \
 	monolib_msw_app.o \
@@ -8274,7 +8748,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_msw_textmeasure.o \
 	monolib_msw_tooltip.o \
 	monolib_msw_toplevel.o \
-	monolib_uiaction.o \
+	monolib_msw_uiaction.o \
 	monolib_utilsgui.o \
 	monolib_utilswin.o \
 	monolib_uxtheme.o \
@@ -8468,6 +8942,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_2 \
 @COND_TOOLKIT_OSX_IPHONE@	= monolib_animateg.o monolib_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	monolib_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
+	monolib_animateg.o \
+	monolib_qt_calctrl.o \
+	monolib_converter.o \
+	monolib_qt_dataview.o \
+	monolib_dvrenderer.o \
+	monolib_dvrenderers.o \
+	monolib_unix_joystick.o \
+	monolib_unix_sound.o \
+	monolib_qt_taskbar.o \
+	monolib_taskbarcmn.o \
+	monolib_qt_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
 	monolib_taskbarcmn.o \
 	monolib_msw_aboutdlg.o \
@@ -8594,6 +9081,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_3 \
 @COND_TOOLKIT_OSX_IPHONE@	= monolib_animateg.o monolib_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	monolib_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
+	monolib_animateg.o \
+	monolib_qt_calctrl.o \
+	monolib_converter.o \
+	monolib_qt_dataview.o \
+	monolib_dvrenderer.o \
+	monolib_dvrenderers.o \
+	monolib_unix_joystick.o \
+	monolib_unix_sound.o \
+	monolib_qt_taskbar.o \
+	monolib_taskbarcmn.o \
+	monolib_qt_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 	monolib_taskbarcmn.o \
 	monolib_msw_aboutdlg.o \
@@ -8628,6 +9128,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_OSX_COCOA@	= monolib_osx_cocoa_mediactrl.o
 @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
 @COND_TOOLKIT_OSX_IPHONE@	= monolib_osx_cocoa_mediactrl.o
+@COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_qt_mediactrl.o
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_WINCE@	monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
 @COND_TOOLKIT_WINCE@	monolib_mediactrl_qt.o
@@ -9078,7 +9579,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_containr.o \
 	coredll_cshelp.o \
 	coredll_ctrlcmn.o \
-	coredll_ctrlsub.o \
+	coredll_common_ctrlsub.o \
 	coredll_dcbase.o \
 	coredll_dcbufcmn.o \
 	coredll_dcgraph.o \
@@ -9300,7 +9801,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_containr.o \
 	coredll_cshelp.o \
 	coredll_ctrlcmn.o \
-	coredll_ctrlsub.o \
+	coredll_common_ctrlsub.o \
 	coredll_dcbase.o \
 	coredll_dcbufcmn.o \
 	coredll_dcgraph.o \
@@ -9651,7 +10152,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_msw_textmeasure.o \
 	coredll_msw_tooltip.o \
 	coredll_msw_toplevel.o \
-	coredll_uiaction.o \
+	coredll_msw_uiaction.o \
 	coredll_utilsgui.o \
 	coredll_utilswin.o \
 	coredll_uxtheme.o \
@@ -9667,6 +10168,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_4 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_4 =  \
+	coredll_qt_accel.o \
+	coredll_qt_app.o \
+	coredll_qt_apptraits.o \
+	coredll_qt_bitmap.o \
+	coredll_qt_bmpbuttn.o \
+	coredll_qt_brush.o \
+	coredll_qt_anybutton.o \
+	coredll_qt_button.o \
+	coredll_generic_caret.o \
+	coredll_qt_checkbox.o \
+	coredll_qt_checklst.o \
+	coredll_qt_choice.o \
+	coredll_qt_clipbrd.o \
+	coredll_qt_clrpicker.o \
+	coredll_clrpickerg.o \
+	coredll_collpaneg.o \
+	coredll_qt_colordlg.o \
+	coredll_qt_colour.o \
+	coredll_qt_combobox.o \
+	coredll_qt_control.o \
+	coredll_converter.o \
+	coredll_qt_ctrlsub.o \
+	coredll_qt_cursor.o \
+	coredll_qt_dataobj.o \
+	coredll_qt_dcclient.o \
+	coredll_qt_dc.o \
+	coredll_qt_dcmemory.o \
+	coredll_qt_dcprint.o \
+	coredll_qt_dcscreen.o \
+	coredll_defs.o \
+	coredll_qt_dialog.o \
+	coredll_unix_dialup.o \
+	coredll_qt_display.o \
+	coredll_qt_dnd.o \
+	coredll_qt_evtloop.o \
+	coredll_generic_fdrepdlg.o \
+	coredll_qt_filedlg.o \
+	coredll_filepickerg.o \
+	coredll_qt_font.o \
+	coredll_qt_fontdlg.o \
+	coredll_qt_fontutil.o \
+	coredll_qt_fontenum.o \
+	coredll_fontpickerg.o \
+	coredll_qt_frame.o \
+	coredll_qt_gauge.o \
+	coredll_generic_icon.o \
+	coredll_generic_imaglist.o \
+	coredll_qt_listbox.o \
+	coredll_qt_listctrl.o \
+	coredll_qt_mdi.o \
+	coredll_qt_menu.o \
+	coredll_qt_menuitem.o \
+	coredll_qt_minifram.o \
+	coredll_qt_msgdlg.o \
+	coredll_qt_notebook.o \
+	coredll_qt_palette.o \
+	coredll_qt_pen.o \
+	coredll_qt_popupwin.o \
+	coredll_qt_printdlg.o \
+	coredll_prntdlgg.o \
+	coredll_printqt.o \
+	coredll_qt_radiobox.o \
+	coredll_qt_radiobut.o \
+	coredll_qt_region.o \
+	coredll_qt_scrolbar.o \
+	coredll_qt_settings.o \
+	coredll_sockqt.o \
+	coredll_qt_slider.o \
+	coredll_qt_spinbutt.o \
+	coredll_qt_spinctrl.o \
+	coredll_qt_statbmp.o \
+	coredll_qt_statbox.o \
+	coredll_qt_statline.o \
+	coredll_qt_stattext.o \
+	coredll_qt_statusbar.o \
+	coredll_qt_textctrl.o \
+	coredll_qt_textentry.o \
+	coredll_generic_textmeasure.o \
+	coredll_qt_tglbtn.o \
+	coredll_qt_timer.o \
+	coredll_qt_toolbar.o \
+	coredll_qt_tooltip.o \
+	coredll_qt_toplevel.o \
+	coredll_qt_uiaction.o \
+	coredll_qt_utils.o \
+	coredll_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_4)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_activex.o \
 	coredll_msw_app.o \
@@ -9713,7 +10302,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_msw_textmeasure.o \
 	coredll_msw_tooltip.o \
 	coredll_msw_toplevel.o \
-	coredll_uiaction.o \
+	coredll_msw_uiaction.o \
 	coredll_utilsgui.o \
 	coredll_utilswin.o \
 	coredll_uxtheme.o \
@@ -9914,7 +10503,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
 	coredll_gtk_colordlg.o \
 	coredll_gtk_combobox.o \
 	coredll_gtk_control.o \
-	coredll_clrpicker.o \
+	coredll_gtk_clrpicker.o \
 	coredll_gtk_dialog.o \
 	coredll_fontpicker.o \
 	coredll_filepicker.o \
@@ -9969,7 +10558,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2 =  \
 	coredll_gtk_colordlg.o \
 	coredll_gtk_combobox.o \
 	coredll_gtk_control.o \
-	coredll_clrpicker.o \
+	coredll_gtk_clrpicker.o \
 	coredll_gtk_dialog.o \
 	coredll_fontpicker.o \
 	coredll_filepicker.o \
@@ -10124,7 +10713,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
 	coredll_msw_spinctrl.o \
 	coredll_msw_statbmp.o \
 	coredll_msw_statbox.o \
-	coredll_statusbar.o \
+	coredll_msw_statusbar.o \
 	coredll_msw_statline.o \
 	coredll_msw_stattext.o \
 	coredll_msw_toolbar.o \
@@ -10229,6 +10818,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 =  \
 	coredll_iphone_utils.o \
 	coredll_iphone_window.o
 @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2)
+@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_2 = 
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
 	coredll_clrpickerg.o \
 	coredll_collpaneg.o \
@@ -10279,7 +10869,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
 	coredll_msw_spinctrl.o \
 	coredll_msw_statbmp.o \
 	coredll_msw_statbox.o \
-	coredll_statusbar.o \
+	coredll_msw_statusbar.o \
 	coredll_msw_statline.o \
 	coredll_msw_stattext.o \
 	coredll_msw_toolbar.o \
@@ -10513,7 +11103,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_msw_textmeasure.o \
 	coredll_msw_tooltip.o \
 	coredll_msw_toplevel.o \
-	coredll_uiaction.o \
+	coredll_msw_uiaction.o \
 	coredll_utilsgui.o \
 	coredll_utilswin.o \
 	coredll_uxtheme.o \
@@ -10529,6 +11119,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_5 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_5 =  \
+	coredll_qt_accel.o \
+	coredll_qt_app.o \
+	coredll_qt_apptraits.o \
+	coredll_qt_bitmap.o \
+	coredll_qt_bmpbuttn.o \
+	coredll_qt_brush.o \
+	coredll_qt_anybutton.o \
+	coredll_qt_button.o \
+	coredll_generic_caret.o \
+	coredll_qt_checkbox.o \
+	coredll_qt_checklst.o \
+	coredll_qt_choice.o \
+	coredll_qt_clipbrd.o \
+	coredll_qt_clrpicker.o \
+	coredll_clrpickerg.o \
+	coredll_collpaneg.o \
+	coredll_qt_colordlg.o \
+	coredll_qt_colour.o \
+	coredll_qt_combobox.o \
+	coredll_qt_control.o \
+	coredll_converter.o \
+	coredll_qt_ctrlsub.o \
+	coredll_qt_cursor.o \
+	coredll_qt_dataobj.o \
+	coredll_qt_dcclient.o \
+	coredll_qt_dc.o \
+	coredll_qt_dcmemory.o \
+	coredll_qt_dcprint.o \
+	coredll_qt_dcscreen.o \
+	coredll_defs.o \
+	coredll_qt_dialog.o \
+	coredll_unix_dialup.o \
+	coredll_qt_display.o \
+	coredll_qt_dnd.o \
+	coredll_qt_evtloop.o \
+	coredll_generic_fdrepdlg.o \
+	coredll_qt_filedlg.o \
+	coredll_filepickerg.o \
+	coredll_qt_font.o \
+	coredll_qt_fontdlg.o \
+	coredll_qt_fontutil.o \
+	coredll_qt_fontenum.o \
+	coredll_fontpickerg.o \
+	coredll_qt_frame.o \
+	coredll_qt_gauge.o \
+	coredll_generic_icon.o \
+	coredll_generic_imaglist.o \
+	coredll_qt_listbox.o \
+	coredll_qt_listctrl.o \
+	coredll_qt_mdi.o \
+	coredll_qt_menu.o \
+	coredll_qt_menuitem.o \
+	coredll_qt_minifram.o \
+	coredll_qt_msgdlg.o \
+	coredll_qt_notebook.o \
+	coredll_qt_palette.o \
+	coredll_qt_pen.o \
+	coredll_qt_popupwin.o \
+	coredll_qt_printdlg.o \
+	coredll_prntdlgg.o \
+	coredll_printqt.o \
+	coredll_qt_radiobox.o \
+	coredll_qt_radiobut.o \
+	coredll_qt_region.o \
+	coredll_qt_scrolbar.o \
+	coredll_qt_settings.o \
+	coredll_sockqt.o \
+	coredll_qt_slider.o \
+	coredll_qt_spinbutt.o \
+	coredll_qt_spinctrl.o \
+	coredll_qt_statbmp.o \
+	coredll_qt_statbox.o \
+	coredll_qt_statline.o \
+	coredll_qt_stattext.o \
+	coredll_qt_statusbar.o \
+	coredll_qt_textctrl.o \
+	coredll_qt_textentry.o \
+	coredll_generic_textmeasure.o \
+	coredll_qt_tglbtn.o \
+	coredll_qt_timer.o \
+	coredll_qt_toolbar.o \
+	coredll_qt_tooltip.o \
+	coredll_qt_toplevel.o \
+	coredll_qt_uiaction.o \
+	coredll_qt_utils.o \
+	coredll_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_5)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_activex.o \
 	coredll_msw_app.o \
@@ -10575,7 +11253,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_msw_textmeasure.o \
 	coredll_msw_tooltip.o \
 	coredll_msw_toplevel.o \
-	coredll_uiaction.o \
+	coredll_msw_uiaction.o \
 	coredll_utilsgui.o \
 	coredll_utilswin.o \
 	coredll_uxtheme.o \
@@ -10670,7 +11348,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_containr.o \
 	corelib_cshelp.o \
 	corelib_ctrlcmn.o \
-	corelib_ctrlsub.o \
+	corelib_common_ctrlsub.o \
 	corelib_dcbase.o \
 	corelib_dcbufcmn.o \
 	corelib_dcgraph.o \
@@ -10892,7 +11570,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_containr.o \
 	corelib_cshelp.o \
 	corelib_ctrlcmn.o \
-	corelib_ctrlsub.o \
+	corelib_common_ctrlsub.o \
 	corelib_dcbase.o \
 	corelib_dcbufcmn.o \
 	corelib_dcgraph.o \
@@ -11243,7 +11921,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_msw_textmeasure.o \
 	corelib_msw_tooltip.o \
 	corelib_msw_toplevel.o \
-	corelib_uiaction.o \
+	corelib_msw_uiaction.o \
 	corelib_utilsgui.o \
 	corelib_utilswin.o \
 	corelib_uxtheme.o \
@@ -11259,6 +11937,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_6 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_6 =  \
+	corelib_qt_accel.o \
+	corelib_qt_app.o \
+	corelib_qt_apptraits.o \
+	corelib_qt_bitmap.o \
+	corelib_qt_bmpbuttn.o \
+	corelib_qt_brush.o \
+	corelib_qt_anybutton.o \
+	corelib_qt_button.o \
+	corelib_generic_caret.o \
+	corelib_qt_checkbox.o \
+	corelib_qt_checklst.o \
+	corelib_qt_choice.o \
+	corelib_qt_clipbrd.o \
+	corelib_qt_clrpicker.o \
+	corelib_clrpickerg.o \
+	corelib_collpaneg.o \
+	corelib_qt_colordlg.o \
+	corelib_qt_colour.o \
+	corelib_qt_combobox.o \
+	corelib_qt_control.o \
+	corelib_converter.o \
+	corelib_qt_ctrlsub.o \
+	corelib_qt_cursor.o \
+	corelib_qt_dataobj.o \
+	corelib_qt_dcclient.o \
+	corelib_qt_dc.o \
+	corelib_qt_dcmemory.o \
+	corelib_qt_dcprint.o \
+	corelib_qt_dcscreen.o \
+	corelib_defs.o \
+	corelib_qt_dialog.o \
+	corelib_unix_dialup.o \
+	corelib_qt_display.o \
+	corelib_qt_dnd.o \
+	corelib_qt_evtloop.o \
+	corelib_generic_fdrepdlg.o \
+	corelib_qt_filedlg.o \
+	corelib_filepickerg.o \
+	corelib_qt_font.o \
+	corelib_qt_fontdlg.o \
+	corelib_qt_fontutil.o \
+	corelib_qt_fontenum.o \
+	corelib_fontpickerg.o \
+	corelib_qt_frame.o \
+	corelib_qt_gauge.o \
+	corelib_generic_icon.o \
+	corelib_generic_imaglist.o \
+	corelib_qt_listbox.o \
+	corelib_qt_listctrl.o \
+	corelib_qt_mdi.o \
+	corelib_qt_menu.o \
+	corelib_qt_menuitem.o \
+	corelib_qt_minifram.o \
+	corelib_qt_msgdlg.o \
+	corelib_qt_notebook.o \
+	corelib_qt_palette.o \
+	corelib_qt_pen.o \
+	corelib_qt_popupwin.o \
+	corelib_qt_printdlg.o \
+	corelib_prntdlgg.o \
+	corelib_printqt.o \
+	corelib_qt_radiobox.o \
+	corelib_qt_radiobut.o \
+	corelib_qt_region.o \
+	corelib_qt_scrolbar.o \
+	corelib_qt_settings.o \
+	corelib_sockqt.o \
+	corelib_qt_slider.o \
+	corelib_qt_spinbutt.o \
+	corelib_qt_spinctrl.o \
+	corelib_qt_statbmp.o \
+	corelib_qt_statbox.o \
+	corelib_qt_statline.o \
+	corelib_qt_stattext.o \
+	corelib_qt_statusbar.o \
+	corelib_qt_textctrl.o \
+	corelib_qt_textentry.o \
+	corelib_generic_textmeasure.o \
+	corelib_qt_tglbtn.o \
+	corelib_qt_timer.o \
+	corelib_qt_toolbar.o \
+	corelib_qt_tooltip.o \
+	corelib_qt_toplevel.o \
+	corelib_qt_uiaction.o \
+	corelib_qt_utils.o \
+	corelib_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_6)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_activex.o \
 	corelib_msw_app.o \
@@ -11305,7 +12071,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_msw_textmeasure.o \
 	corelib_msw_tooltip.o \
 	corelib_msw_toplevel.o \
-	corelib_uiaction.o \
+	corelib_msw_uiaction.o \
 	corelib_utilsgui.o \
 	corelib_utilswin.o \
 	corelib_uxtheme.o \
@@ -11506,7 +12272,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
 	corelib_gtk_colordlg.o \
 	corelib_gtk_combobox.o \
 	corelib_gtk_control.o \
-	corelib_clrpicker.o \
+	corelib_gtk_clrpicker.o \
 	corelib_gtk_dialog.o \
 	corelib_fontpicker.o \
 	corelib_filepicker.o \
@@ -11561,7 +12327,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3 =  \
 	corelib_gtk_colordlg.o \
 	corelib_gtk_combobox.o \
 	corelib_gtk_control.o \
-	corelib_clrpicker.o \
+	corelib_gtk_clrpicker.o \
 	corelib_gtk_dialog.o \
 	corelib_fontpicker.o \
 	corelib_filepicker.o \
@@ -11716,7 +12482,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
 	corelib_msw_spinctrl.o \
 	corelib_msw_statbmp.o \
 	corelib_msw_statbox.o \
-	corelib_statusbar.o \
+	corelib_msw_statusbar.o \
 	corelib_msw_statline.o \
 	corelib_msw_stattext.o \
 	corelib_msw_toolbar.o \
@@ -11821,6 +12587,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 =  \
 	corelib_iphone_utils.o \
 	corelib_iphone_window.o
 @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3)
+@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_3 = 
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 	corelib_clrpickerg.o \
 	corelib_collpaneg.o \
@@ -11871,7 +12638,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 	corelib_msw_spinctrl.o \
 	corelib_msw_statbmp.o \
 	corelib_msw_statbox.o \
-	corelib_statusbar.o \
+	corelib_msw_statusbar.o \
 	corelib_msw_statline.o \
 	corelib_msw_stattext.o \
 	corelib_msw_toolbar.o \
@@ -12105,7 +12872,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_msw_textmeasure.o \
 	corelib_msw_tooltip.o \
 	corelib_msw_toplevel.o \
-	corelib_uiaction.o \
+	corelib_msw_uiaction.o \
 	corelib_utilsgui.o \
 	corelib_utilswin.o \
 	corelib_uxtheme.o \
@@ -12121,6 +12888,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
 @COND_TOOLKIT_OSX_COCOA@	$(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
 @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_7 \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
+COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_7 =  \
+	corelib_qt_accel.o \
+	corelib_qt_app.o \
+	corelib_qt_apptraits.o \
+	corelib_qt_bitmap.o \
+	corelib_qt_bmpbuttn.o \
+	corelib_qt_brush.o \
+	corelib_qt_anybutton.o \
+	corelib_qt_button.o \
+	corelib_generic_caret.o \
+	corelib_qt_checkbox.o \
+	corelib_qt_checklst.o \
+	corelib_qt_choice.o \
+	corelib_qt_clipbrd.o \
+	corelib_qt_clrpicker.o \
+	corelib_clrpickerg.o \
+	corelib_collpaneg.o \
+	corelib_qt_colordlg.o \
+	corelib_qt_colour.o \
+	corelib_qt_combobox.o \
+	corelib_qt_control.o \
+	corelib_converter.o \
+	corelib_qt_ctrlsub.o \
+	corelib_qt_cursor.o \
+	corelib_qt_dataobj.o \
+	corelib_qt_dcclient.o \
+	corelib_qt_dc.o \
+	corelib_qt_dcmemory.o \
+	corelib_qt_dcprint.o \
+	corelib_qt_dcscreen.o \
+	corelib_defs.o \
+	corelib_qt_dialog.o \
+	corelib_unix_dialup.o \
+	corelib_qt_display.o \
+	corelib_qt_dnd.o \
+	corelib_qt_evtloop.o \
+	corelib_generic_fdrepdlg.o \
+	corelib_qt_filedlg.o \
+	corelib_filepickerg.o \
+	corelib_qt_font.o \
+	corelib_qt_fontdlg.o \
+	corelib_qt_fontutil.o \
+	corelib_qt_fontenum.o \
+	corelib_fontpickerg.o \
+	corelib_qt_frame.o \
+	corelib_qt_gauge.o \
+	corelib_generic_icon.o \
+	corelib_generic_imaglist.o \
+	corelib_qt_listbox.o \
+	corelib_qt_listctrl.o \
+	corelib_qt_mdi.o \
+	corelib_qt_menu.o \
+	corelib_qt_menuitem.o \
+	corelib_qt_minifram.o \
+	corelib_qt_msgdlg.o \
+	corelib_qt_notebook.o \
+	corelib_qt_palette.o \
+	corelib_qt_pen.o \
+	corelib_qt_popupwin.o \
+	corelib_qt_printdlg.o \
+	corelib_prntdlgg.o \
+	corelib_printqt.o \
+	corelib_qt_radiobox.o \
+	corelib_qt_radiobut.o \
+	corelib_qt_region.o \
+	corelib_qt_scrolbar.o \
+	corelib_qt_settings.o \
+	corelib_sockqt.o \
+	corelib_qt_slider.o \
+	corelib_qt_spinbutt.o \
+	corelib_qt_spinctrl.o \
+	corelib_qt_statbmp.o \
+	corelib_qt_statbox.o \
+	corelib_qt_statline.o \
+	corelib_qt_stattext.o \
+	corelib_qt_statusbar.o \
+	corelib_qt_textctrl.o \
+	corelib_qt_textentry.o \
+	corelib_generic_textmeasure.o \
+	corelib_qt_tglbtn.o \
+	corelib_qt_timer.o \
+	corelib_qt_toolbar.o \
+	corelib_qt_tooltip.o \
+	corelib_qt_toplevel.o \
+	corelib_qt_uiaction.o \
+	corelib_qt_utils.o \
+	corelib_qt_window.o
+@COND_TOOLKIT_QT@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_QT___LOWLEVEL_SRC_OBJECTS_7)
 COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_activex.o \
 	corelib_msw_app.o \
@@ -12167,7 +13022,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_msw_textmeasure.o \
 	corelib_msw_tooltip.o \
 	corelib_msw_toplevel.o \
-	corelib_uiaction.o \
+	corelib_msw_uiaction.o \
 	corelib_utilsgui.o \
 	corelib_utilswin.o \
 	corelib_uxtheme.o \
@@ -12430,6 +13285,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_4 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_4 \
 @COND_TOOLKIT_OSX_IPHONE@	= advdll_animateg.o advdll_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	advdll_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4 =  \
+	advdll_animateg.o \
+	advdll_qt_calctrl.o \
+	advdll_converter.o \
+	advdll_qt_dataview.o \
+	advdll_dvrenderer.o \
+	advdll_dvrenderers.o \
+	advdll_unix_joystick.o \
+	advdll_unix_sound.o \
+	advdll_qt_taskbar.o \
+	advdll_taskbarcmn.o \
+	advdll_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_4 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_4 =  \
 	advdll_taskbarcmn.o \
 	advdll_msw_aboutdlg.o \
@@ -12556,6 +13424,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_5 \
 @COND_TOOLKIT_OSX_IPHONE@	= advdll_animateg.o advdll_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	advdll_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
+	advdll_animateg.o \
+	advdll_qt_calctrl.o \
+	advdll_converter.o \
+	advdll_qt_dataview.o \
+	advdll_dvrenderer.o \
+	advdll_dvrenderers.o \
+	advdll_unix_joystick.o \
+	advdll_unix_sound.o \
+	advdll_qt_taskbar.o \
+	advdll_taskbarcmn.o \
+	advdll_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_5 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
 	advdll_taskbarcmn.o \
 	advdll_msw_aboutdlg.o \
@@ -12737,6 +13618,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_6 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_6 \
 @COND_TOOLKIT_OSX_IPHONE@	= advlib_animateg.o advlib_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	advlib_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6 =  \
+	advlib_animateg.o \
+	advlib_qt_calctrl.o \
+	advlib_converter.o \
+	advlib_qt_dataview.o \
+	advlib_dvrenderer.o \
+	advlib_dvrenderers.o \
+	advlib_unix_joystick.o \
+	advlib_unix_sound.o \
+	advlib_qt_taskbar.o \
+	advlib_taskbarcmn.o \
+	advlib_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_6 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_6 =  \
 	advlib_taskbarcmn.o \
 	advlib_msw_aboutdlg.o \
@@ -12863,6 +13757,19 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
 @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_7 \
 @COND_TOOLKIT_OSX_IPHONE@	= advlib_animateg.o advlib_sound_osx.o \
 @COND_TOOLKIT_OSX_IPHONE@	advlib_core_sound.o
+COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
+	advlib_animateg.o \
+	advlib_qt_calctrl.o \
+	advlib_converter.o \
+	advlib_qt_dataview.o \
+	advlib_dvrenderer.o \
+	advlib_dvrenderers.o \
+	advlib_unix_joystick.o \
+	advlib_unix_sound.o \
+	advlib_qt_taskbar.o \
+	advlib_taskbarcmn.o \
+	advlib_utils.o
+@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_7 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7)
 COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
 	advlib_taskbarcmn.o \
 	advlib_msw_aboutdlg.o \
@@ -12972,6 +13879,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_OSX_COCOA@	= mediadll_osx_cocoa_mediactrl.o
 @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
 @COND_TOOLKIT_OSX_IPHONE@	= mediadll_osx_cocoa_mediactrl.o
+@COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_qt_mediactrl.o
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
 @COND_TOOLKIT_WINCE@	mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
 @COND_TOOLKIT_WINCE@	mediadll_mediactrl_qt.o
@@ -13006,6 +13914,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_OSX_COCOA@	= medialib_osx_cocoa_mediactrl.o
 @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
 @COND_TOOLKIT_OSX_IPHONE@	= medialib_osx_cocoa_mediactrl.o
+@COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_qt_mediactrl.o
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
 @COND_TOOLKIT_WINCE@	medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
 @COND_TOOLKIT_WINCE@	medialib_mediactrl_qt.o
@@ -13941,6 +14850,7 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_cmd = rm -f \
 @COND_TOOLKIT_OSX_COCOA@	= gldll_osx_cocoa_glcanvas.o gldll_glcanvas_osx.o
 @COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS \
 @COND_TOOLKIT_OSX_IPHONE@	= gldll_iphone_glcanvas.o gldll_glcanvas_osx.o
+@COND_TOOLKIT_QT@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_qt_glcanvas.o
 @COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o
 @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = \
 @COND_TOOLKIT_X11@	gldll_x11_glcanvas.o gldll_glx11.o
@@ -13983,6 +14893,7 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
 @COND_TOOLKIT_OSX_COCOA@	= gllib_osx_cocoa_glcanvas.o gllib_glcanvas_osx.o
 @COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
 @COND_TOOLKIT_OSX_IPHONE@	= gllib_iphone_glcanvas.o gllib_glcanvas_osx.o
+@COND_TOOLKIT_QT@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_qt_glcanvas.o
 @COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o
 @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
 @COND_TOOLKIT_X11@	gllib_x11_glcanvas.o gllib_glx11.o
@@ -14002,8 +14913,8 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
 @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
 @COND_SHARED_0@____SHARED = 
 @COND_SHARED_1@____SHARED = $(PIC_FLAG)
-@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o
-@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o
+@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_unix_apptraits.o
+@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS = monodll_unix_apptraits.o
 COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS =  \
 	monodll_anybutton_osx.o \
 	monodll_bmpbuttn_osx.o \
@@ -14148,8 +15059,8 @@ COND_PLATFORM_UNIX_1___ADVANCED_GTK_PLATFORM_SRC_OBJECTS =  \
 @COND_PLATFORM_WIN32_1@__ADVANCED_GTK_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_WIN32_1@	= monodll_taskbarcmn.o monodll_msw_joystick.o \
 @COND_PLATFORM_WIN32_1@	monodll_msw_sound.o
-@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
-@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
+@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_unix_apptraits.o
+@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_unix_apptraits.o
 COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_12 =  \
 	monolib_anybutton_osx.o \
 	monolib_bmpbuttn_osx.o \
@@ -14294,8 +15205,8 @@ COND_PLATFORM_UNIX_1___ADVANCED_GTK_PLATFORM_SRC_OBJECTS_17 =  \
 @COND_PLATFORM_WIN32_1@__ADVANCED_GTK_PLATFORM_SRC_OBJECTS_17 \
 @COND_PLATFORM_WIN32_1@	= monolib_taskbarcmn.o monolib_msw_joystick.o \
 @COND_PLATFORM_WIN32_1@	monolib_msw_sound.o
-@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
-@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
+@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_unix_apptraits.o
+@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_unix_apptraits.o
 COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_14 =  \
 	coredll_anybutton_osx.o \
 	coredll_bmpbuttn_osx.o \
@@ -14425,8 +15336,8 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 =  \
 	coredll_core_timer.o \
 	coredll_utilsexc_cf.o
 @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4)
-@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
-@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
+@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_unix_apptraits.o
+@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_unix_apptraits.o
 COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_1_0 =  \
 	corelib_anybutton_osx.o \
 	corelib_bmpbuttn_osx.o \
@@ -17667,6 +18578,9 @@ monodll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODE
 monodll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
 
+monodll_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/mediactrl.cpp
+
 monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
 
@@ -18255,6 +19169,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -18288,6 +19205,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
@@ -18309,6 +19229,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
@@ -18534,6 +19457,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -18765,6 +19691,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
 
@@ -19128,10 +20057,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
@@ -19497,26 +20426,161 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monodll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
 
-@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_accel.o: $(srcdir)/src/qt/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/accel.cpp
 
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_app.o: $(srcdir)/src/qt/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/app.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_apptraits.o: $(srcdir)/src/qt/apptraits.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/apptraits.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_bitmap.o: $(srcdir)/src/qt/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/bitmap.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_bmpbuttn.o: $(srcdir)/src/qt/bmpbuttn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/bmpbuttn.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_brush.o: $(srcdir)/src/qt/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/brush.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/anybutton.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_button.o: $(srcdir)/src/qt/button.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/button.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_checklst.o: $(srcdir)/src/qt/checklst.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/checklst.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_choice.o: $(srcdir)/src/qt/choice.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/choice.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_clipbrd.o: $(srcdir)/src/qt/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/clipbrd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_clrpicker.o: $(srcdir)/src/qt/clrpicker.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/clrpicker.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_colordlg.o: $(srcdir)/src/qt/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/colordlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_colour.o: $(srcdir)/src/qt/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/colour.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_combobox.o: $(srcdir)/src/qt/combobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/combobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_control.o: $(srcdir)/src/qt/control.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/control.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_converter.o: $(srcdir)/src/qt/converter.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_converter.o: $(srcdir)/src/qt/converter.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_ctrlsub.o: $(srcdir)/src/qt/ctrlsub.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/ctrlsub.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/cursor.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dc.o: $(srcdir)/src/qt/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dc.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dcmemory.o: $(srcdir)/src/qt/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dcmemory.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dcprint.o: $(srcdir)/src/qt/dcprint.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dcprint.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dcscreen.o: $(srcdir)/src/qt/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dcscreen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_defs.o: $(srcdir)/src/qt/defs.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/defs.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dialog.o: $(srcdir)/src/qt/dialog.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dialog.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_display.o: $(srcdir)/src/qt/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/display.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -19545,9 +20609,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_filedlg.o: $(srcdir)/src/qt/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/filedlg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
@@ -19578,35 +20648,95 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_font.o: $(srcdir)/src/qt/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/font.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_fontdlg.o: $(srcdir)/src/qt/fontdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/fontdlg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_fontutil.o: $(srcdir)/src/qt/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/fontutil.cpp
 
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_fontenum.o: $(srcdir)/src/qt/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/fontenum.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_frame.o: $(srcdir)/src/qt/frame.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/frame.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_gauge.o: $(srcdir)/src/qt/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/gauge.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_listbox.o: $(srcdir)/src/qt/listbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/listbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_listctrl.o: $(srcdir)/src/qt/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/listctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_mdi.o: $(srcdir)/src/qt/mdi.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/mdi.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_menu.o: $(srcdir)/src/qt/menu.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/menu.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_menuitem.o: $(srcdir)/src/qt/menuitem.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/menuitem.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_minifram.o: $(srcdir)/src/qt/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/minifram.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/msgdlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_pen.o: $(srcdir)/src/qt/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/pen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_popupwin.o: $(srcdir)/src/qt/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/popupwin.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_printdlg.o: $(srcdir)/src/qt/printdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/printdlg.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -19635,9 +20765,138 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_printqt.o: $(srcdir)/src/qt/printqt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/printqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_radiobox.o: $(srcdir)/src/qt/radiobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/radiobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_radiobut.o: $(srcdir)/src/qt/radiobut.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/radiobut.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_region.o: $(srcdir)/src/qt/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/region.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_scrolbar.o: $(srcdir)/src/qt/scrolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/scrolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_settings.o: $(srcdir)/src/qt/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/settings.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_sockqt.o: $(srcdir)/src/qt/sockqt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/sockqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_slider.o: $(srcdir)/src/qt/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/slider.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_spinbutt.o: $(srcdir)/src/qt/spinbutt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/spinbutt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_spinctrl.o: $(srcdir)/src/qt/spinctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/spinctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_statbmp.o: $(srcdir)/src/qt/statbmp.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/statbmp.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_statbox.o: $(srcdir)/src/qt/statbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/statbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_statline.o: $(srcdir)/src/qt/statline.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/statline.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/stattext.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_textentry.o: $(srcdir)/src/qt/textentry.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/textentry.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_tglbtn.o: $(srcdir)/src/qt/tglbtn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/tglbtn.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_timer.o: $(srcdir)/src/qt/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/timer.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_toolbar.o: $(srcdir)/src/qt/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/toolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_tooltip.o: $(srcdir)/src/qt/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/tooltip.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_toplevel.o: $(srcdir)/src/qt/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/toplevel.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_uiaction.o: $(srcdir)/src/qt/uiaction.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/uiaction.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp
+
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
 
@@ -19734,10 +20993,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONODLL_ODEP)
@@ -19971,60 +21230,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -20085,33 +21290,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
 
@@ -20376,10 +21554,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
@@ -21003,7 +22181,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
 
-@COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@monodll_common_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
 @COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP)
@@ -21558,6 +22736,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -21621,6 +22802,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
@@ -21726,6 +22910,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -21747,6 +22934,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -21792,6 +22982,21 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
 
@@ -23235,6 +24440,9 @@ monolib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODE
 monolib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
 
+monolib_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/mediactrl.cpp
+
 monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
 
@@ -23823,6 +25031,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -23856,6 +25067,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
@@ -23877,6 +25091,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
@@ -24102,6 +25319,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -24333,6 +25553,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
 
@@ -24696,10 +25919,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
@@ -25065,26 +26288,161 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@monolib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
 
-@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_accel.o: $(srcdir)/src/qt/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/accel.cpp
 
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_app.o: $(srcdir)/src/qt/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/app.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_apptraits.o: $(srcdir)/src/qt/apptraits.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/apptraits.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_bitmap.o: $(srcdir)/src/qt/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/bitmap.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_bmpbuttn.o: $(srcdir)/src/qt/bmpbuttn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/bmpbuttn.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_brush.o: $(srcdir)/src/qt/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/brush.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/anybutton.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_button.o: $(srcdir)/src/qt/button.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/button.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_checklst.o: $(srcdir)/src/qt/checklst.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/checklst.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_choice.o: $(srcdir)/src/qt/choice.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/choice.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_clipbrd.o: $(srcdir)/src/qt/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/clipbrd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_clrpicker.o: $(srcdir)/src/qt/clrpicker.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/clrpicker.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_colordlg.o: $(srcdir)/src/qt/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/colordlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_colour.o: $(srcdir)/src/qt/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/colour.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_combobox.o: $(srcdir)/src/qt/combobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/combobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_control.o: $(srcdir)/src/qt/control.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/control.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_converter.o: $(srcdir)/src/qt/converter.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_converter.o: $(srcdir)/src/qt/converter.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_ctrlsub.o: $(srcdir)/src/qt/ctrlsub.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/ctrlsub.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/cursor.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dc.o: $(srcdir)/src/qt/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dc.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dcmemory.o: $(srcdir)/src/qt/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dcmemory.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dcprint.o: $(srcdir)/src/qt/dcprint.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dcprint.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dcscreen.o: $(srcdir)/src/qt/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dcscreen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_defs.o: $(srcdir)/src/qt/defs.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/defs.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dialog.o: $(srcdir)/src/qt/dialog.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dialog.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_display.o: $(srcdir)/src/qt/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/display.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -25113,9 +26471,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_filedlg.o: $(srcdir)/src/qt/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/filedlg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
@@ -25146,35 +26510,95 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_font.o: $(srcdir)/src/qt/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/font.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_fontdlg.o: $(srcdir)/src/qt/fontdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/fontdlg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_fontutil.o: $(srcdir)/src/qt/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/fontutil.cpp
 
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_fontenum.o: $(srcdir)/src/qt/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/fontenum.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_frame.o: $(srcdir)/src/qt/frame.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/frame.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_gauge.o: $(srcdir)/src/qt/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/gauge.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_listbox.o: $(srcdir)/src/qt/listbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/listbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_listctrl.o: $(srcdir)/src/qt/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/listctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_mdi.o: $(srcdir)/src/qt/mdi.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/mdi.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_menu.o: $(srcdir)/src/qt/menu.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/menu.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_menuitem.o: $(srcdir)/src/qt/menuitem.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/menuitem.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_minifram.o: $(srcdir)/src/qt/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/minifram.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/msgdlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_pen.o: $(srcdir)/src/qt/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/pen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_popupwin.o: $(srcdir)/src/qt/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/popupwin.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_printdlg.o: $(srcdir)/src/qt/printdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/printdlg.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -25203,9 +26627,138 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_printqt.o: $(srcdir)/src/qt/printqt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/printqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_radiobox.o: $(srcdir)/src/qt/radiobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/radiobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_radiobut.o: $(srcdir)/src/qt/radiobut.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/radiobut.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_region.o: $(srcdir)/src/qt/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/region.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_scrolbar.o: $(srcdir)/src/qt/scrolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/scrolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_settings.o: $(srcdir)/src/qt/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/settings.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_sockqt.o: $(srcdir)/src/qt/sockqt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/sockqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_slider.o: $(srcdir)/src/qt/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/slider.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_spinbutt.o: $(srcdir)/src/qt/spinbutt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/spinbutt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_spinctrl.o: $(srcdir)/src/qt/spinctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/spinctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_statbmp.o: $(srcdir)/src/qt/statbmp.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/statbmp.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_statbox.o: $(srcdir)/src/qt/statbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/statbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_statline.o: $(srcdir)/src/qt/statline.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/statline.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/stattext.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_textentry.o: $(srcdir)/src/qt/textentry.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/textentry.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_tglbtn.o: $(srcdir)/src/qt/tglbtn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/tglbtn.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_timer.o: $(srcdir)/src/qt/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/timer.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_toolbar.o: $(srcdir)/src/qt/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/toolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_tooltip.o: $(srcdir)/src/qt/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/tooltip.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_toplevel.o: $(srcdir)/src/qt/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/toplevel.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_uiaction.o: $(srcdir)/src/qt/uiaction.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/uiaction.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp
+
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
 
@@ -25302,10 +26855,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONOLIB_ODEP)
@@ -25539,60 +27092,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -25653,33 +27152,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
 
@@ -25944,10 +27416,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
@@ -26571,7 +28043,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
 
-@COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@monolib_common_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
 @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP)
@@ -27126,6 +28598,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -27189,6 +28664,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
@@ -27294,6 +28772,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -27315,6 +28796,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -27360,6 +28844,21 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
 
@@ -29508,6 +31007,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -29541,6 +31043,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
@@ -29562,6 +31067,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
@@ -29787,6 +31295,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -30018,6 +31529,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
 
@@ -30381,10 +31895,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
@@ -30750,26 +32264,158 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@coredll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
 
-@COND_PLATFORM_UNIX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_accel.o: $(srcdir)/src/qt/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/accel.cpp
 
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_app.o: $(srcdir)/src/qt/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/app.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_apptraits.o: $(srcdir)/src/qt/apptraits.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/apptraits.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_bitmap.o: $(srcdir)/src/qt/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/bitmap.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_bmpbuttn.o: $(srcdir)/src/qt/bmpbuttn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/bmpbuttn.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_brush.o: $(srcdir)/src/qt/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/brush.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/anybutton.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_button.o: $(srcdir)/src/qt/button.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/button.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_checklst.o: $(srcdir)/src/qt/checklst.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/checklst.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_choice.o: $(srcdir)/src/qt/choice.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/choice.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_clipbrd.o: $(srcdir)/src/qt/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/clipbrd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_clrpicker.o: $(srcdir)/src/qt/clrpicker.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/clrpicker.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_colordlg.o: $(srcdir)/src/qt/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/colordlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_colour.o: $(srcdir)/src/qt/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/colour.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_combobox.o: $(srcdir)/src/qt/combobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/combobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_control.o: $(srcdir)/src/qt/control.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/control.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_converter.o: $(srcdir)/src/qt/converter.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_ctrlsub.o: $(srcdir)/src/qt/ctrlsub.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/ctrlsub.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/cursor.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dc.o: $(srcdir)/src/qt/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dc.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dcmemory.o: $(srcdir)/src/qt/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dcmemory.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dcprint.o: $(srcdir)/src/qt/dcprint.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dcprint.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dcscreen.o: $(srcdir)/src/qt/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dcscreen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_defs.o: $(srcdir)/src/qt/defs.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/defs.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dialog.o: $(srcdir)/src/qt/dialog.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dialog.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_display.o: $(srcdir)/src/qt/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/display.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -30798,9 +32444,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_filedlg.o: $(srcdir)/src/qt/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/filedlg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
@@ -30831,35 +32483,95 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_font.o: $(srcdir)/src/qt/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/font.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_fontdlg.o: $(srcdir)/src/qt/fontdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/fontdlg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_fontutil.o: $(srcdir)/src/qt/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/fontutil.cpp
 
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_fontenum.o: $(srcdir)/src/qt/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/fontenum.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_frame.o: $(srcdir)/src/qt/frame.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/frame.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_gauge.o: $(srcdir)/src/qt/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/gauge.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_listbox.o: $(srcdir)/src/qt/listbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/listbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_listctrl.o: $(srcdir)/src/qt/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/listctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_mdi.o: $(srcdir)/src/qt/mdi.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/mdi.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_menu.o: $(srcdir)/src/qt/menu.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/menu.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_menuitem.o: $(srcdir)/src/qt/menuitem.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/menuitem.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_minifram.o: $(srcdir)/src/qt/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/minifram.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/msgdlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_pen.o: $(srcdir)/src/qt/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/pen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_popupwin.o: $(srcdir)/src/qt/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/popupwin.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_printdlg.o: $(srcdir)/src/qt/printdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/printdlg.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -30888,9 +32600,135 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_printqt.o: $(srcdir)/src/qt/printqt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/printqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_radiobox.o: $(srcdir)/src/qt/radiobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/radiobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_radiobut.o: $(srcdir)/src/qt/radiobut.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/radiobut.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_region.o: $(srcdir)/src/qt/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/region.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_scrolbar.o: $(srcdir)/src/qt/scrolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/scrolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_settings.o: $(srcdir)/src/qt/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/settings.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_sockqt.o: $(srcdir)/src/qt/sockqt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/sockqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_slider.o: $(srcdir)/src/qt/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/slider.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_spinbutt.o: $(srcdir)/src/qt/spinbutt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/spinbutt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_spinctrl.o: $(srcdir)/src/qt/spinctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/spinctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_statbmp.o: $(srcdir)/src/qt/statbmp.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/statbmp.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_statbox.o: $(srcdir)/src/qt/statbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/statbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_statline.o: $(srcdir)/src/qt/statline.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/statline.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/stattext.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_textentry.o: $(srcdir)/src/qt/textentry.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/textentry.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_tglbtn.o: $(srcdir)/src/qt/tglbtn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/tglbtn.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_timer.o: $(srcdir)/src/qt/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/timer.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_toolbar.o: $(srcdir)/src/qt/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/toolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_tooltip.o: $(srcdir)/src/qt/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/tooltip.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_toplevel.o: $(srcdir)/src/qt/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/toplevel.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_uiaction.o: $(srcdir)/src/qt/uiaction.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/uiaction.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@coredll_qt_window.o: $(srcdir)/src/qt/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp
+
+@COND_PLATFORM_UNIX_1_USE_GUI_1@coredll_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
 
@@ -30987,10 +32825,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(COREDLL_ODEP)
@@ -31224,60 +33062,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -31338,33 +33122,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
 
@@ -31629,10 +33386,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
@@ -32256,7 +34013,7 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
 
-@COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@coredll_common_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
 @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP)
@@ -33624,6 +35381,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
@@ -33657,6 +35417,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
@@ -33678,6 +35441,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
 
@@ -33903,6 +35669,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
 
@@ -34134,6 +35903,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
 
@@ -34497,10 +36269,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
@@ -34866,26 +36638,158 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@corelib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_DFB_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
 
-@COND_PLATFORM_UNIX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_accel.o: $(srcdir)/src/qt/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/accel.cpp
 
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_app.o: $(srcdir)/src/qt/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/app.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_apptraits.o: $(srcdir)/src/qt/apptraits.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/apptraits.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_bitmap.o: $(srcdir)/src/qt/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/bitmap.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_bmpbuttn.o: $(srcdir)/src/qt/bmpbuttn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/bmpbuttn.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_brush.o: $(srcdir)/src/qt/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/brush.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/anybutton.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_button.o: $(srcdir)/src/qt/button.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/button.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_checklst.o: $(srcdir)/src/qt/checklst.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/checklst.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_choice.o: $(srcdir)/src/qt/choice.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/choice.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_clipbrd.o: $(srcdir)/src/qt/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/clipbrd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_clrpicker.o: $(srcdir)/src/qt/clrpicker.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/clrpicker.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_colordlg.o: $(srcdir)/src/qt/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/colordlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_colour.o: $(srcdir)/src/qt/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/colour.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_combobox.o: $(srcdir)/src/qt/combobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/combobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_control.o: $(srcdir)/src/qt/control.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/control.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_converter.o: $(srcdir)/src/qt/converter.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_ctrlsub.o: $(srcdir)/src/qt/ctrlsub.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/ctrlsub.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/cursor.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dc.o: $(srcdir)/src/qt/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dc.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dcmemory.o: $(srcdir)/src/qt/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dcmemory.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dcprint.o: $(srcdir)/src/qt/dcprint.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dcprint.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dcscreen.o: $(srcdir)/src/qt/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dcscreen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_defs.o: $(srcdir)/src/qt/defs.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/defs.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dialog.o: $(srcdir)/src/qt/dialog.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dialog.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_display.o: $(srcdir)/src/qt/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/display.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -34914,9 +36818,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_filedlg.o: $(srcdir)/src/qt/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/filedlg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
@@ -34947,35 +36857,95 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_font.o: $(srcdir)/src/qt/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/font.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_fontdlg.o: $(srcdir)/src/qt/fontdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/fontdlg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_fontutil.o: $(srcdir)/src/qt/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/fontutil.cpp
 
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_fontenum.o: $(srcdir)/src/qt/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/fontenum.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
 
-@COND_USE_GUI_1_WXUNIV_1@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_frame.o: $(srcdir)/src/qt/frame.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/frame.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_gauge.o: $(srcdir)/src/qt/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/gauge.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_listbox.o: $(srcdir)/src/qt/listbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/listbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_listctrl.o: $(srcdir)/src/qt/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/listctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_mdi.o: $(srcdir)/src/qt/mdi.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/mdi.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_menu.o: $(srcdir)/src/qt/menu.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/menu.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_menuitem.o: $(srcdir)/src/qt/menuitem.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/menuitem.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_minifram.o: $(srcdir)/src/qt/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/minifram.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/msgdlg.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_pen.o: $(srcdir)/src/qt/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/pen.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_popupwin.o: $(srcdir)/src/qt/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/popupwin.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_printdlg.o: $(srcdir)/src/qt/printdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/printdlg.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -35004,9 +36974,135 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
 
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_printqt.o: $(srcdir)/src/qt/printqt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/printqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_radiobox.o: $(srcdir)/src/qt/radiobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/radiobox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_radiobut.o: $(srcdir)/src/qt/radiobut.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/radiobut.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_region.o: $(srcdir)/src/qt/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/region.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_scrolbar.o: $(srcdir)/src/qt/scrolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/scrolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_settings.o: $(srcdir)/src/qt/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/settings.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_sockqt.o: $(srcdir)/src/qt/sockqt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/sockqt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_slider.o: $(srcdir)/src/qt/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/slider.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_spinbutt.o: $(srcdir)/src/qt/spinbutt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/spinbutt.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_spinctrl.o: $(srcdir)/src/qt/spinctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/spinctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_statbmp.o: $(srcdir)/src/qt/statbmp.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/statbmp.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_statbox.o: $(srcdir)/src/qt/statbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/statbox.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_statline.o: $(srcdir)/src/qt/statline.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/statline.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/stattext.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_textentry.o: $(srcdir)/src/qt/textentry.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/textentry.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_tglbtn.o: $(srcdir)/src/qt/tglbtn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/tglbtn.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_timer.o: $(srcdir)/src/qt/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/timer.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_toolbar.o: $(srcdir)/src/qt/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/toolbar.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_tooltip.o: $(srcdir)/src/qt/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/tooltip.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_toplevel.o: $(srcdir)/src/qt/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/toplevel.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_uiaction.o: $(srcdir)/src/qt/uiaction.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/uiaction.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1@corelib_qt_window.o: $(srcdir)/src/qt/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp
+
+@COND_PLATFORM_UNIX_1_USE_GUI_1@corelib_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_unix_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
 
@@ -35103,10 +37199,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_gtk_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(CORELIB_ODEP)
@@ -35340,60 +37436,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -35454,33 +37496,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
 
@@ -35745,10 +37760,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
@@ -36372,7 +38387,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
 
-@COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@corelib_common_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
 
 @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(CORELIB_ODEP)
@@ -36933,6 +38948,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
+@COND_TOOLKIT_QT@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
 @COND_TOOLKIT_MSW@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -36996,6 +39014,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
+@COND_TOOLKIT_QT@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
@@ -37101,6 +39122,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
+@COND_TOOLKIT_QT@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
 @COND_TOOLKIT_MOTIF@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -37122,6 +39146,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
+@COND_TOOLKIT_QT@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
 @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -37167,6 +39194,27 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
 
+@COND_TOOLKIT_QT@advdll_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
+
+@COND_TOOLKIT_QT@advdll_converter.o: $(srcdir)/src/qt/converter.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT@advdll_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
+
+@COND_TOOLKIT_QT@advdll_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
+
+@COND_TOOLKIT_QT@advdll_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
+
+@COND_TOOLKIT_QT@advdll_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
+
+@COND_TOOLKIT_QT@advdll_utils.o: $(srcdir)/src/qt/utils.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
 
@@ -37395,6 +39443,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
 
+@COND_TOOLKIT_QT@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
+
 @COND_TOOLKIT_MSW@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
 
@@ -37458,6 +39509,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
+@COND_TOOLKIT_QT@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
 
@@ -37563,6 +39617,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
 
+@COND_TOOLKIT_QT@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
+
 @COND_TOOLKIT_MOTIF@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
@@ -37584,6 +39641,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
 
+@COND_TOOLKIT_QT@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+
 @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MOTIF@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
 
@@ -37629,6 +39689,27 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
 
+@COND_TOOLKIT_QT@advlib_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
+
+@COND_TOOLKIT_QT@advlib_converter.o: $(srcdir)/src/qt/converter.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/converter.cpp
+
+@COND_TOOLKIT_QT@advlib_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
+
+@COND_TOOLKIT_QT@advlib_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
+
+@COND_TOOLKIT_QT@advlib_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
+
+@COND_TOOLKIT_QT@advlib_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
+
+@COND_TOOLKIT_QT@advlib_utils.o: $(srcdir)/src/qt/utils.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/qt/utils.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
 
@@ -37725,6 +39806,9 @@ mediadll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_O
 mediadll_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
 	$(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
 
+mediadll_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIADLL_ODEP)
+	$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/qt/mediactrl.cpp
+
 @COND_TOOLKIT_MSW@mediadll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIADLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
 
@@ -37767,6 +39851,9 @@ medialib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_O
 medialib_src_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
 	$(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
 
+medialib_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIALIB_ODEP)
+	$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/qt/mediactrl.cpp
+
 @COND_TOOLKIT_MSW@medialib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIALIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
 
@@ -38733,6 +40820,9 @@ gldll_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP)
 gldll_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLDLL_ODEP)
 	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
 
+gldll_qt_glcanvas.o: $(srcdir)/src/qt/glcanvas.cpp $(GLDLL_ODEP)
+	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/qt/glcanvas.cpp
+
 @COND_TOOLKIT_OSX_CARBON@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
 @COND_TOOLKIT_OSX_CARBON@	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
 
@@ -38793,6 +40883,9 @@ gllib_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP)
 gllib_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLLIB_ODEP)
 	$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
 
+gllib_qt_glcanvas.o: $(srcdir)/src/qt/glcanvas.cpp $(GLLIB_ODEP)
+	$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/qt/glcanvas.cpp
+
 @COND_TOOLKIT_OSX_CARBON@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
 @COND_TOOLKIT_OSX_CARBON@	$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
 
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 9351ca1574..15eef12edb 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,4 +1,4 @@
-dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
 dnl Bakefile 0.2.9 (http://www.bakefile.org)
@@ -8,55 +8,55 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
-dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_debug="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_debug=""
     fi
     AC_SUBST(COND_BUILD_debug)
-dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_debug_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_debug_DEBUG_INFO_default=""
     fi
     AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
-dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_release="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_release=""
     fi
     AC_SUBST(COND_BUILD_release)
-dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_release_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_release_DEBUG_INFO_default=""
     fi
     AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
-dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_FLAG_0="#"
     if test "x$DEBUG_FLAG" = "x0" ; then
         COND_DEBUG_FLAG_0=""
     fi
     AC_SUBST(COND_DEBUG_FLAG_0)
-dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_0="#"
     if test "x$DEBUG_INFO" = "x0" ; then
         COND_DEBUG_INFO_0=""
     fi
     AC_SUBST(COND_DEBUG_INFO_0)
-dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_1="#"
     if test "x$DEBUG_INFO" = "x1" ; then
         COND_DEBUG_INFO_1=""
     fi
     AC_SUBST(COND_DEBUG_INFO_1)
-dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
         COND_DEPS_TRACKING_0=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_0)
-dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_1="#"
     if test "x$DEPS_TRACKING" = "x1" ; then
         COND_DEPS_TRACKING_1=""
@@ -74,7 +74,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../tests/test.bkl,wx.bkl] ###
         COND_ICC_PCH_1=""
     fi
     AC_SUBST(COND_ICC_PCH_1)
-dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
         COND_MONOLITHIC_0=""
@@ -152,7 +152,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1=""
@@ -248,7 +248,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_HTML_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_MEDIA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
         COND_MONOLITHIC_0_USE_MEDIA_1=""
@@ -284,7 +284,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
         COND_MONOLITHIC_0_USE_WEBVIEW_1=""
@@ -296,7 +296,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
@@ -314,19 +314,19 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
         COND_MONOLITHIC_1_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
-dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1_USE_STC_1="#"
     if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then
         COND_MONOLITHIC_1_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_USE_STC_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -344,7 +344,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_MACOSX_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" ; then
         COND_PLATFORM_MACOSX_1=""
@@ -440,13 +440,13 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
     COND_PLATFORM_MAC_0="#"
     if test "x$PLATFORM_MAC" = "x0" ; then
         COND_PLATFORM_MAC_0=""
     fi
     AC_SUBST(COND_PLATFORM_MAC_0)
-dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
     COND_PLATFORM_MAC_1="#"
     if test "x$PLATFORM_MAC" = "x1" ; then
         COND_PLATFORM_MAC_1=""
@@ -464,19 +464,19 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ###
         COND_PLATFORM_MSDOS_1=""
     fi
     AC_SUBST(COND_PLATFORM_MSDOS_1)
-dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_PLATFORM_OS2_1="#"
     if test "x$PLATFORM_OS2" = "x1" ; then
         COND_PLATFORM_OS2_1=""
     fi
     AC_SUBST(COND_PLATFORM_OS2_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_0="#"
     if test "x$PLATFORM_UNIX" = "x0" ; then
         COND_PLATFORM_UNIX_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_0)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_1="#"
     if test "x$PLATFORM_UNIX" = "x1" ; then
         COND_PLATFORM_UNIX_1=""
@@ -518,7 +518,7 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
         COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_0="#"
     if test "x$PLATFORM_WIN32" = "x0" ; then
         COND_PLATFORM_WIN32_0=""
@@ -530,7 +530,7 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bk
         COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
         COND_PLATFORM_WIN32_1=""
@@ -638,7 +638,7 @@ dnl ### begin block 20_COND_SHARED_0_wxUSE_ZLIB_builtin[wx.bkl] ###
         COND_SHARED_0_wxUSE_ZLIB_builtin=""
     fi
     AC_SUBST(COND_SHARED_0_wxUSE_ZLIB_builtin)
-dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_SHARED_1="#"
     if test "x$SHARED" = "x1" ; then
         COND_SHARED_1=""
@@ -662,7 +662,7 @@ dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
         COND_TOOLKIT_=""
     fi
     AC_SUBST(COND_TOOLKIT_)
-dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
         COND_TOOLKIT_COCOA=""
@@ -782,7 +782,7 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_GTK_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
         COND_TOOLKIT_MAC=""
@@ -806,7 +806,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
@@ -830,7 +830,7 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MSW_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_OSX_CARBON="#"
     if test "x$TOOLKIT" = "xOSX_CARBON" ; then
         COND_TOOLKIT_OSX_CARBON=""
@@ -842,7 +842,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_OSX_COCOA="#"
     if test "x$TOOLKIT" = "xOSX_COCOA" ; then
         COND_TOOLKIT_OSX_COCOA=""
@@ -854,7 +854,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_OSX_IPHONE="#"
     if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
         COND_TOOLKIT_OSX_IPHONE=""
@@ -872,6 +872,24 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_QT[wx.bkl] ###
+    COND_TOOLKIT_QT="#"
+    if test "x$TOOLKIT" = "xQT" ; then
+        COND_TOOLKIT_QT=""
+    fi
+    AC_SUBST(COND_TOOLKIT_QT)
+dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_QT_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_QT_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_Qt[wx.bkl] ###
+    COND_TOOLKIT_Qt="#"
+    if test "x$TOOLKIT" = "xQt" ; then
+        COND_TOOLKIT_Qt=""
+    fi
+    AC_SUBST(COND_TOOLKIT_Qt)
 dnl ### begin block 20_COND_TOOLKIT_WINCE[wx.bkl] ###
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then
@@ -920,37 +938,37 @@ dnl ### begin block 20_COND_TOOLKIT_X11_WXUNIV_1[wx.bkl] ###
         COND_TOOLKIT_X11_WXUNIV_1=""
     fi
     AC_SUBST(COND_TOOLKIT_X11_WXUNIV_1)
-dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)
-dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_CAIRO_1="#"
     if test "x$USE_CAIRO" = "x1" ; then
         COND_USE_CAIRO_1=""
     fi
     AC_SUBST(COND_USE_CAIRO_1)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_0)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_1="#"
     if test "x$USE_EXCEPTIONS" = "x1" ; then
         COND_USE_EXCEPTIONS_1=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_1)
-dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
         COND_USE_GUI_0=""
     fi
     AC_SUBST(COND_USE_GUI_0)
-dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1="#"
     if test "x$USE_GUI" = "x1" ; then
         COND_USE_GUI_1=""
@@ -974,19 +992,19 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
@@ -1004,19 +1022,19 @@ dnl ### begin block 20_COND_USE_PCH_1[../../tests/test.bkl,wx.bkl] ###
         COND_USE_PCH_1=""
     fi
     AC_SUBST(COND_USE_PCH_1)
-dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
         COND_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_USE_PLUGINS_0)
-dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_0="#"
     if test "x$USE_RTTI" = "x0" ; then
         COND_USE_RTTI_0=""
     fi
     AC_SUBST(COND_USE_RTTI_0)
-dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_1="#"
     if test "x$USE_RTTI" = "x1" ; then
         COND_USE_RTTI_1=""
@@ -1064,13 +1082,13 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
         COND_USE_STC_1=""
     fi
     AC_SUBST(COND_USE_STC_1)
-dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_0="#"
     if test "x$USE_THREADS" = "x0" ; then
         COND_USE_THREADS_0=""
     fi
     AC_SUBST(COND_USE_THREADS_0)
-dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_1="#"
     if test "x$USE_THREADS" = "x1" ; then
         COND_USE_THREADS_1=""
@@ -1100,43 +1118,43 @@ dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
         COND_WXUNIV_0=""
     fi
     AC_SUBST(COND_WXUNIV_0)
-dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
-dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_EXPAT_builtin="#"
     if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_wxUSE_EXPAT_builtin=""
     fi
     AC_SUBST(COND_wxUSE_EXPAT_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBJPEG_builtin="#"
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_wxUSE_LIBJPEG_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBPNG_builtin="#"
     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_wxUSE_LIBPNG_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBTIFF_builtin="#"
     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_wxUSE_LIBTIFF_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBTIFF_builtin)
-dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_REGEX_builtin="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_wxUSE_REGEX_builtin=""
     fi
     AC_SUBST(COND_wxUSE_REGEX_builtin)
-dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_ZLIB_builtin="#"
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
         COND_wxUSE_ZLIB_builtin=""
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 1f019b58f9..453f466c87 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -21,6 +21,9 @@
         <set var="PLATFORM_MACOS">0</set>
     </if>
 
+    <set var="PLATFORM_QT">0</set>
+
+
     <include file="config.bkl"/>
 
     <include file="plugins_deps.bkl"/>
@@ -61,12 +64,10 @@
     <set var="COMPILER_VERSION" make_var="1">
         <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD</if>
     </set>
-
     <set var="COMPILERORGCC">
         <if cond="isdefined('COMPILER')">$(COMPILER)</if>
         <if cond="not isdefined('COMPILER')">gcc</if>
     </set>
-
     <!--
         In the official builds we use not only the compiler name but also its
         version and architecture we compile for in the libraries names.
@@ -181,6 +182,7 @@
     <set var="WXLIB_STC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
     </set>
+
     <set var="WXLIB_WEBVIEW">
         <if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
     </set>
@@ -193,6 +195,7 @@
     <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
 
+
     <if cond="FORMAT!='autoconf'">
         <set var="WXDLLFLAG">
             <if cond="SHARED=='1'">dll</if>
@@ -336,7 +339,6 @@
             <define>_CRT_NON_CONFORMING_SWPRINTFS=1</define>
             <define>_SCL_SECURE_NO_WARNINGS=1</define>
         </if>
-
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
         <if cond="FORMAT=='msvc'">
@@ -553,6 +555,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
         <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
+
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(CAIRO_LIB)</sys-lib>
@@ -614,7 +617,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <set var="LIB_SCINTILLA_IF_MONO">
         <if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_SCINTILLA)</if>
     </set>
-
     <template id="wx_append_base" template_append="wx_append_base_nomono">
         <!-- Always link against the full wx library in monolithic build and
              also against the PNG one as core code references it for Tango
@@ -697,7 +699,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
-
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
diff --git a/build/bakefiles/common_samples_intree.bkl b/build/bakefiles/common_samples_intree.bkl
index c0c487854c..1a07ca18dd 100644
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -49,11 +49,13 @@
         <if cond="FORMAT=='autoconf'">
             <wx-mac-app-bundle/>
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+            <cxxflags>$(SAMPLES_CXXFLAGS)</cxxflags>
         </if>
     </template>
     <template id="wx_sample_console" template="wx_util_console">
         <if cond="FORMAT=='autoconf'">
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+            <cxxflags>$(SAMPLES_CXXFLAGS)</cxxflags>
         </if>
     </template>
 
diff --git a/build/bakefiles/common_samples_outoftree.bkl b/build/bakefiles/common_samples_outoftree.bkl
index e17e7576c5..fd008c3f8d 100644
--- a/build/bakefiles/common_samples_outoftree.bkl
+++ b/build/bakefiles/common_samples_outoftree.bkl
@@ -20,8 +20,16 @@
         <app-type>console</app-type>
     </template>
     
-    <template id="wx_sample" template="wx_util"/>
-    <template id="wx_sample_console" template="wx_util_console"/>
+    <template id="wx_sample" template="wx_util">
+        <if cond="FORMAT=='autoconf'">
+            <cxxflags>$(SAMPLES_CXXFLAGS)</cxxflags>
+        </if>
+    </template>
+    <template id="wx_sample_console" template="wx_util_console">
+        <if cond="FORMAT=='autoconf'">
+            <cxxflags>$(SAMPLES_CXXFLAGS)</cxxflags>
+        </if>
+    </template>
     
 
     <define-rule name="wx-gui-plugin" extends="module">
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index d7e6128253..f122d55f91 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -415,6 +415,7 @@ to run the tests, include CppUnit library here.
         <option name="DYLIB_RPATH_INSTALL"/>
         <option name="DYLIB_RPATH_POSTLINK"/>
         <option name="SAMPLES_RPATH_FLAG"/>
+        <option name="SAMPLES_CXXFLAGS"/>
 
         <!-- see configure.in; it's required by some samples on Mac OS X -->
         <option name="HEADER_PAD_OPTION"/>
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 7c5a02bd71..81af630435 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -43,6 +43,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
      ====================================================================== -->
 
+
 <if cond="FORMAT in ['borland','mingw','msvc','watcom']">
     <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
     </define-rule>
@@ -253,6 +254,223 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msdos/mimetype.h
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               wxQT                                       -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<set var="QT_LOWLEVEL_HDR" hints="files">
+    wx/qt/accel.h
+    wx/qt/app.h
+    wx/qt/apptbase.h
+    wx/qt/apptrait.h
+    wx/qt/bitmap.h
+    wx/qt/bmpbuttn.h
+    wx/qt/brush.h
+    wx/qt/anybutton.h
+    wx/qt/button.h
+    wx/qt/checkbox.h
+    wx/qt/checklst.h
+    wx/qt/choice.h
+    wx/qt/clipbrd.h
+    wx/qt/clrpicker.h
+    wx/qt/generic/clrpickerg.h
+    wx/generic/collpaneg.h
+    wx/qt/colordlg.h
+    wx/qt/colour.h
+    wx/qt/combobox.h
+    wx/qt/control.h
+    wx/qt/converter.h
+    wx/qt/ctrlsub.h
+    wx/qt/cursor.h
+    wx/qt/dataform.h
+    wx/qt/dataobj2.h
+    wx/qt/dataobj.h
+    wx/qt/dcclient.h
+    wx/qt/dc.h
+    wx/qt/dcmemory.h
+    wx/qt/dcprint.h
+    wx/qt/dcscreen.h
+    wx/qt/defs.h
+    wx/qt/dialog.h
+    wx/qt/dirdlg.h
+    wx/qt/dnd.h
+    wx/qt/evtloop.h
+    wx/qt/filedlg.h
+    wx/qt/font.h
+    wx/qt/fontdlg.h
+    wx/qt/frame.h
+    wx/qt/gauge.h
+    wx/generic/icon.h
+    wx/generic/imaglist.h
+    wx/qt/listbox.h
+    wx/qt/listctrl.h
+    wx/qt/mdi.h
+    wx/qt/menu.h
+    wx/qt/menuitem.h
+    wx/qt/minifram.h
+    wx/qt/msgdlg.h
+    wx/qt/notebook.h
+    wx/qt/palette.h
+    wx/qt/pen.h
+    wx/qt/popupwin.h
+    wx/qt/printdlg.h
+    wx/generic/prntdlgg.h
+    wx/qt/printqt.h
+    wx/qt/radiobox.h
+    wx/qt/radiobut.h
+    wx/qt/region.h
+    wx/qt/scrolbar.h
+    wx/qt/slider.h
+    wx/qt/spinbutt.h
+    wx/qt/spinctrl.h
+    wx/qt/statbmp.h
+    wx/qt/statbox.h
+    wx/qt/statline.h
+    wx/qt/statusbar.h
+    wx/qt/stattext.h
+    wx/qt/textctrl.h
+    wx/qt/textdlg.h
+    wx/qt/textentry.h
+    wx/qt/tglbtn.h
+    wx/qt/timer.h
+    wx/qt/toolbar.h
+    wx/qt/tooltip.h
+    wx/qt/toplevel.h
+    <!-- wx/qt/treectrl.h -->
+    wx/qt/utils.h
+    wx/qt/window.h
+    wx/qt/private/winevent.h
+</set>
+
+<set var="QT_LOWLEVEL_SRC" hints="files">
+    src/qt/accel.cpp
+    src/qt/app.cpp
+    src/qt/apptraits.cpp
+    src/qt/bitmap.cpp
+    src/qt/bmpbuttn.cpp
+    src/qt/brush.cpp
+    src/qt/anybutton.cpp
+    src/qt/button.cpp
+    src/generic/caret.cpp
+    src/qt/checkbox.cpp
+    src/qt/checklst.cpp
+    src/qt/choice.cpp
+    src/qt/clipbrd.cpp
+    src/qt/clrpicker.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/qt/colordlg.cpp
+    src/qt/colour.cpp
+    src/qt/combobox.cpp
+    src/qt/control.cpp
+    src/qt/converter.cpp
+    src/qt/ctrlsub.cpp
+    src/qt/cursor.cpp
+    src/qt/dataobj.cpp
+    src/qt/dcclient.cpp
+    src/qt/dc.cpp
+    src/qt/dcmemory.cpp
+    src/qt/dcprint.cpp
+    src/qt/dcscreen.cpp
+    src/qt/defs.cpp
+    src/qt/dialog.cpp
+    src/unix/dialup.cpp
+    src/qt/display.cpp
+    src/qt/dnd.cpp
+    src/qt/evtloop.cpp
+    src/generic/fdrepdlg.cpp
+    src/qt/filedlg.cpp
+    src/generic/filepickerg.cpp
+    src/qt/font.cpp
+    src/qt/fontdlg.cpp
+    src/qt/fontutil.cpp
+    src/qt/fontenum.cpp
+    src/generic/fontpickerg.cpp
+    src/qt/frame.cpp
+    src/qt/gauge.cpp
+    src/generic/icon.cpp
+    src/generic/imaglist.cpp
+    src/qt/listbox.cpp
+    src/qt/listctrl.cpp
+    src/qt/mdi.cpp
+    src/qt/menu.cpp
+    src/qt/menuitem.cpp
+    src/qt/minifram.cpp
+    src/qt/msgdlg.cpp
+    src/qt/notebook.cpp
+    src/qt/palette.cpp
+    src/qt/pen.cpp
+    src/qt/popupwin.cpp
+    src/qt/printdlg.cpp
+    src/generic/prntdlgg.cpp
+    src/qt/printqt.cpp
+    src/qt/radiobox.cpp
+    src/qt/radiobut.cpp
+    src/qt/region.cpp
+    src/qt/scrolbar.cpp
+    src/qt/settings.cpp
+    src/qt/sockqt.cpp
+    src/qt/slider.cpp
+    src/qt/spinbutt.cpp
+    src/qt/spinctrl.cpp
+    src/qt/statbmp.cpp
+    src/qt/statbox.cpp
+    src/qt/statline.cpp
+    src/qt/stattext.cpp
+    src/qt/statusbar.cpp
+    src/qt/textctrl.cpp
+    src/qt/textentry.cpp
+    src/generic/textmeasure.cpp
+    src/qt/tglbtn.cpp
+    src/qt/timer.cpp
+    src/qt/toolbar.cpp
+    src/qt/tooltip.cpp
+    src/qt/toplevel.cpp
+    <!-- src/qt/treectrl.cpp -->
+    src/qt/uiaction.cpp
+    src/qt/utils.cpp
+    src/qt/window.cpp
+</set>
+
+<set var="ADVANCED_QT_HDR" hints="files">
+    wx/generic/animate.h
+    wx/qt/calctrl.h
+    wx/qt/dataview.h
+    wx/qt/dvrenderer.h
+    wx/qt/dvrenderers.h
+    wx/qt/taskbar.h
+</set>
+
+<set var="ADVANCED_QT_SRC" hints="files">
+    src/generic/animateg.cpp
+    src/qt/calctrl.cpp
+    src/qt/converter.cpp
+    src/qt/dataview.cpp
+    src/qt/dvrenderer.cpp
+    src/qt/dvrenderers.cpp
+    src/unix/joystick.cpp
+    src/unix/sound.cpp
+    src/qt/taskbar.cpp
+    src/common/taskbarcmn.cpp
+    src/qt/utils.cpp
+</set>
+
+<set var="QT_HDR" hints="files">
+</set>
+
+<set var="QT_SRC" hints="files">
+</set>
+
+<set var="MEDIA_QT_SRC" hints="files">
+    src/qt/mediactrl.cpp
+</set>
+
+<set var="MEDIA_QT_HDR" hints="files">
+</set>
+
+<set var="NET_QT_SRC" hints="files">
+</set>
+
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                              Common                                    -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -545,6 +763,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
 </set>
 
+
 <set var="NET_CMN_SRC" hints="files">
     src/common/fs_inet.cpp
     src/common/ftp.cpp
@@ -2592,7 +2811,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         wx/msw/evtloop.h
     </if>
 </set>
-
 <set var="UNIV_SRC" hints="files">
     $(UNIV_PLATFORM_SRC)
     src/generic/accel.cpp
@@ -2925,6 +3143,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/joystick.h
 </set>
 
+
 <set var="ADVANCED_UNIX_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/unix/joystick.cpp
@@ -3083,6 +3302,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_COCOA_HDR" hints="files">
 </set>
 
+
 <set var="MEDIA_UNIX_SRC" hints="files">
     src/unix/mediactrl.cpp
 </set>
@@ -3394,6 +3614,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         src/gtk1/glcanvas.cpp
         src/unix/glx11.cpp
     </if>
+    <if cond="TOOLKIT=='QT'">src/qt/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
@@ -3421,6 +3642,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         wx/gtk1/glcanvas.h
         wx/unix/glx11.h
     </if>
+    <if cond="TOOLKIT=='Qt'">wx/qt/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
@@ -3701,6 +3923,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='QT'">$(QT_LOWLEVEL_SRC)</if>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_HDR)</if>
@@ -3715,6 +3938,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='QT'">$(QT_LOWLEVEL_HDR)</if>
     </set>
 
     <set var="PLATFORM_SRC" hints="files">
@@ -3733,6 +3957,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
         <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_IPHONE_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
+        <if cond="TOOLKIT=='QT'">$(QT_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
@@ -3745,6 +3970,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>
         <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_SHARED_HDR) $(OSX_IPHONE_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
+        <if cond="TOOLKIT=='QT'">$(QT_HDR)</if>
     </set>
 
     <set var="CORE_SRC" hints="files">
@@ -3769,6 +3995,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='QT'">$(ADVANCED_QT_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
@@ -3782,6 +4009,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='QT'">$(ADVANCED_QT_HDR)</if>
     </set>
 
     <!-- wxAdv files not used by wxUniv -->
@@ -3818,6 +4046,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='QT'">$(MEDIA_QT_SRC)</if>
     </set>
     <set var="MEDIA_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
@@ -3829,6 +4058,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='QT'">$(MEDIA_QT_HDR)</if>
     </set>
     <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
     <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 73e2f76cfb..3a2dbca8e5 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1986,6 +1986,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
+	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2027,10 +2028,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
-	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
-	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -2261,6 +2260,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
+	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2302,10 +2302,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
-	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
-	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -2794,6 +2792,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
+	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -2835,10 +2834,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
-	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
-	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3069,6 +3066,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
+	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -3110,10 +3108,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
-	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
-	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3478,6 +3474,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
+	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -3519,10 +3516,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
-	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
-	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -3753,6 +3748,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
+	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -3794,10 +3790,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
-	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
-	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -4038,6 +4032,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
+	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4079,10 +4074,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
-	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
-	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -4313,6 +4306,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
+	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4354,10 +4348,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
-	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
-	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -8268,6 +8260,11 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -8473,11 +8470,6 @@ $(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -8488,11 +8480,6 @@ $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -10739,6 +10726,11 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -10944,11 +10936,6 @@ $(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -10959,11 +10946,6 @@ $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -13156,6 +13138,11 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -13361,11 +13348,6 @@ $(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -13376,11 +13358,6 @@ $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -14603,6 +14580,11 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -14808,11 +14790,6 @@ $(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -14823,11 +14800,6 @@ $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 4b5787b502..9712780c2e 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -2005,6 +2005,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.o \
 	$(OBJS)\monodll_tbarbase.o \
 	$(OBJS)\monodll_textcmn.o \
+	$(OBJS)\monodll_textdlg.o \
 	$(OBJS)\monodll_textentrycmn.o \
 	$(OBJS)\monodll_textmeasurecmn.o \
 	$(OBJS)\monodll_toplvcmn.o \
@@ -2046,10 +2047,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.o \
 	$(OBJS)\monodll_statbmpg.o \
 	$(OBJS)\monodll_stattextg.o \
-	$(OBJS)\monodll_textdlgg.o \
 	$(OBJS)\monodll_tipwin.o \
 	$(OBJS)\monodll_toolbkg.o \
-	$(OBJS)\monodll_treectlg.o \
 	$(OBJS)\monodll_treebkg.o \
 	$(OBJS)\monodll_vlbox.o \
 	$(OBJS)\monodll_vscroll.o \
@@ -2282,6 +2281,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.o \
 	$(OBJS)\monodll_tbarbase.o \
 	$(OBJS)\monodll_textcmn.o \
+	$(OBJS)\monodll_textdlg.o \
 	$(OBJS)\monodll_textentrycmn.o \
 	$(OBJS)\monodll_textmeasurecmn.o \
 	$(OBJS)\monodll_toplvcmn.o \
@@ -2323,10 +2323,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.o \
 	$(OBJS)\monodll_statbmpg.o \
 	$(OBJS)\monodll_stattextg.o \
-	$(OBJS)\monodll_textdlgg.o \
 	$(OBJS)\monodll_tipwin.o \
 	$(OBJS)\monodll_toolbkg.o \
-	$(OBJS)\monodll_treectlg.o \
 	$(OBJS)\monodll_treebkg.o \
 	$(OBJS)\monodll_vlbox.o \
 	$(OBJS)\monodll_vscroll.o \
@@ -2819,6 +2817,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.o \
 	$(OBJS)\monolib_tbarbase.o \
 	$(OBJS)\monolib_textcmn.o \
+	$(OBJS)\monolib_textdlg.o \
 	$(OBJS)\monolib_textentrycmn.o \
 	$(OBJS)\monolib_textmeasurecmn.o \
 	$(OBJS)\monolib_toplvcmn.o \
@@ -2860,10 +2859,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.o \
 	$(OBJS)\monolib_statbmpg.o \
 	$(OBJS)\monolib_stattextg.o \
-	$(OBJS)\monolib_textdlgg.o \
 	$(OBJS)\monolib_tipwin.o \
 	$(OBJS)\monolib_toolbkg.o \
-	$(OBJS)\monolib_treectlg.o \
 	$(OBJS)\monolib_treebkg.o \
 	$(OBJS)\monolib_vlbox.o \
 	$(OBJS)\monolib_vscroll.o \
@@ -3096,6 +3093,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.o \
 	$(OBJS)\monolib_tbarbase.o \
 	$(OBJS)\monolib_textcmn.o \
+	$(OBJS)\monolib_textdlg.o \
 	$(OBJS)\monolib_textentrycmn.o \
 	$(OBJS)\monolib_textmeasurecmn.o \
 	$(OBJS)\monolib_toplvcmn.o \
@@ -3137,10 +3135,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.o \
 	$(OBJS)\monolib_statbmpg.o \
 	$(OBJS)\monolib_stattextg.o \
-	$(OBJS)\monolib_textdlgg.o \
 	$(OBJS)\monolib_tipwin.o \
 	$(OBJS)\monolib_toolbkg.o \
-	$(OBJS)\monolib_treectlg.o \
 	$(OBJS)\monolib_treebkg.o \
 	$(OBJS)\monolib_vlbox.o \
 	$(OBJS)\monolib_vscroll.o \
@@ -3519,6 +3515,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.o \
 	$(OBJS)\coredll_tbarbase.o \
 	$(OBJS)\coredll_textcmn.o \
+	$(OBJS)\coredll_textdlg.o \
 	$(OBJS)\coredll_textentrycmn.o \
 	$(OBJS)\coredll_textmeasurecmn.o \
 	$(OBJS)\coredll_toplvcmn.o \
@@ -3560,10 +3557,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.o \
 	$(OBJS)\coredll_statbmpg.o \
 	$(OBJS)\coredll_stattextg.o \
-	$(OBJS)\coredll_textdlgg.o \
 	$(OBJS)\coredll_tipwin.o \
 	$(OBJS)\coredll_toolbkg.o \
-	$(OBJS)\coredll_treectlg.o \
 	$(OBJS)\coredll_treebkg.o \
 	$(OBJS)\coredll_vlbox.o \
 	$(OBJS)\coredll_vscroll.o \
@@ -3796,6 +3791,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.o \
 	$(OBJS)\coredll_tbarbase.o \
 	$(OBJS)\coredll_textcmn.o \
+	$(OBJS)\coredll_textdlg.o \
 	$(OBJS)\coredll_textentrycmn.o \
 	$(OBJS)\coredll_textmeasurecmn.o \
 	$(OBJS)\coredll_toplvcmn.o \
@@ -3837,10 +3833,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.o \
 	$(OBJS)\coredll_statbmpg.o \
 	$(OBJS)\coredll_stattextg.o \
-	$(OBJS)\coredll_textdlgg.o \
 	$(OBJS)\coredll_tipwin.o \
 	$(OBJS)\coredll_toolbkg.o \
-	$(OBJS)\coredll_treectlg.o \
 	$(OBJS)\coredll_treebkg.o \
 	$(OBJS)\coredll_vlbox.o \
 	$(OBJS)\coredll_vscroll.o \
@@ -4087,6 +4081,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.o \
 	$(OBJS)\corelib_tbarbase.o \
 	$(OBJS)\corelib_textcmn.o \
+	$(OBJS)\corelib_textdlg.o \
 	$(OBJS)\corelib_textentrycmn.o \
 	$(OBJS)\corelib_textmeasurecmn.o \
 	$(OBJS)\corelib_toplvcmn.o \
@@ -4128,10 +4123,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.o \
 	$(OBJS)\corelib_statbmpg.o \
 	$(OBJS)\corelib_stattextg.o \
-	$(OBJS)\corelib_textdlgg.o \
 	$(OBJS)\corelib_tipwin.o \
 	$(OBJS)\corelib_toolbkg.o \
-	$(OBJS)\corelib_treectlg.o \
 	$(OBJS)\corelib_treebkg.o \
 	$(OBJS)\corelib_vlbox.o \
 	$(OBJS)\corelib_vscroll.o \
@@ -4364,6 +4357,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.o \
 	$(OBJS)\corelib_tbarbase.o \
 	$(OBJS)\corelib_textcmn.o \
+	$(OBJS)\corelib_textdlg.o \
 	$(OBJS)\corelib_textentrycmn.o \
 	$(OBJS)\corelib_textmeasurecmn.o \
 	$(OBJS)\corelib_toplvcmn.o \
@@ -4405,10 +4399,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.o \
 	$(OBJS)\corelib_statbmpg.o \
 	$(OBJS)\corelib_stattextg.o \
-	$(OBJS)\corelib_textdlgg.o \
 	$(OBJS)\corelib_tipwin.o \
 	$(OBJS)\corelib_toolbkg.o \
-	$(OBJS)\corelib_treectlg.o \
 	$(OBJS)\corelib_treebkg.o \
 	$(OBJS)\corelib_vlbox.o \
 	$(OBJS)\corelib_vscroll.o \
@@ -8443,6 +8435,11 @@ $(OBJS)\monodll_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_textdlg.o: ../../src/common/textdlg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8648,11 +8645,6 @@ $(OBJS)\monodll_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8663,11 +8655,6 @@ $(OBJS)\monodll_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10914,6 +10901,11 @@ $(OBJS)\monolib_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_textdlg.o: ../../src/common/textdlg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11119,11 +11111,6 @@ $(OBJS)\monolib_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_textdlgg.o: ../../src/generic/textdlgg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11134,11 +11121,6 @@ $(OBJS)\monolib_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_treectlg.o: ../../src/generic/treectlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13331,6 +13313,11 @@ $(OBJS)\coredll_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_textdlg.o: ../../src/common/textdlg.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13536,11 +13523,6 @@ $(OBJS)\coredll_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_textdlgg.o: ../../src/generic/textdlgg.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13551,11 +13533,6 @@ $(OBJS)\coredll_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_treectlg.o: ../../src/generic/treectlg.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14778,6 +14755,11 @@ $(OBJS)\corelib_textcmn.o: ../../src/common/textcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_textdlg.o: ../../src/common/textdlg.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_textentrycmn.o: ../../src/common/textentrycmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14983,11 +14965,6 @@ $(OBJS)\corelib_stattextg.o: ../../src/generic/stattextg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_textdlgg.o: ../../src/generic/textdlgg.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_tipwin.o: ../../src/generic/tipwin.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14998,11 +14975,6 @@ $(OBJS)\corelib_toolbkg.o: ../../src/generic/toolbkg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_treectlg.o: ../../src/generic/treectlg.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_treebkg.o: ../../src/generic/treebkg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index e5088e4391..5f73088ffc 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2286,6 +2286,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
+	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2327,10 +2328,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
-	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
-	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -2561,6 +2560,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_stockitem.obj \
 	$(OBJS)\monodll_tbarbase.obj \
 	$(OBJS)\monodll_textcmn.obj \
+	$(OBJS)\monodll_textdlg.obj \
 	$(OBJS)\monodll_textentrycmn.obj \
 	$(OBJS)\monodll_textmeasurecmn.obj \
 	$(OBJS)\monodll_toplvcmn.obj \
@@ -2602,10 +2602,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_srchctlg.obj \
 	$(OBJS)\monodll_statbmpg.obj \
 	$(OBJS)\monodll_stattextg.obj \
-	$(OBJS)\monodll_textdlgg.obj \
 	$(OBJS)\monodll_tipwin.obj \
 	$(OBJS)\monodll_toolbkg.obj \
-	$(OBJS)\monodll_treectlg.obj \
 	$(OBJS)\monodll_treebkg.obj \
 	$(OBJS)\monodll_vlbox.obj \
 	$(OBJS)\monodll_vscroll.obj \
@@ -3100,6 +3098,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
+	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -3141,10 +3140,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
-	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
-	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3375,6 +3372,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_stockitem.obj \
 	$(OBJS)\monolib_tbarbase.obj \
 	$(OBJS)\monolib_textcmn.obj \
+	$(OBJS)\monolib_textdlg.obj \
 	$(OBJS)\monolib_textentrycmn.obj \
 	$(OBJS)\monolib_textmeasurecmn.obj \
 	$(OBJS)\monolib_toplvcmn.obj \
@@ -3416,10 +3414,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_srchctlg.obj \
 	$(OBJS)\monolib_statbmpg.obj \
 	$(OBJS)\monolib_stattextg.obj \
-	$(OBJS)\monolib_textdlgg.obj \
 	$(OBJS)\monolib_tipwin.obj \
 	$(OBJS)\monolib_toolbkg.obj \
-	$(OBJS)\monolib_treectlg.obj \
 	$(OBJS)\monolib_treebkg.obj \
 	$(OBJS)\monolib_vlbox.obj \
 	$(OBJS)\monolib_vscroll.obj \
@@ -3850,6 +3846,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
+	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -3891,10 +3888,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
-	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
-	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -4125,6 +4120,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_stockitem.obj \
 	$(OBJS)\coredll_tbarbase.obj \
 	$(OBJS)\coredll_textcmn.obj \
+	$(OBJS)\coredll_textdlg.obj \
 	$(OBJS)\coredll_textentrycmn.obj \
 	$(OBJS)\coredll_textmeasurecmn.obj \
 	$(OBJS)\coredll_toplvcmn.obj \
@@ -4166,10 +4162,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_srchctlg.obj \
 	$(OBJS)\coredll_statbmpg.obj \
 	$(OBJS)\coredll_stattextg.obj \
-	$(OBJS)\coredll_textdlgg.obj \
 	$(OBJS)\coredll_tipwin.obj \
 	$(OBJS)\coredll_toolbkg.obj \
-	$(OBJS)\coredll_treectlg.obj \
 	$(OBJS)\coredll_treebkg.obj \
 	$(OBJS)\coredll_vlbox.obj \
 	$(OBJS)\coredll_vscroll.obj \
@@ -4416,6 +4410,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
+	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4457,10 +4452,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
-	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
-	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -4691,6 +4684,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_stockitem.obj \
 	$(OBJS)\corelib_tbarbase.obj \
 	$(OBJS)\corelib_textcmn.obj \
+	$(OBJS)\corelib_textdlg.obj \
 	$(OBJS)\corelib_textentrycmn.obj \
 	$(OBJS)\corelib_textmeasurecmn.obj \
 	$(OBJS)\corelib_toplvcmn.obj \
@@ -4732,10 +4726,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_srchctlg.obj \
 	$(OBJS)\corelib_statbmpg.obj \
 	$(OBJS)\corelib_stattextg.obj \
-	$(OBJS)\corelib_textdlgg.obj \
 	$(OBJS)\corelib_tipwin.obj \
 	$(OBJS)\corelib_toolbkg.obj \
-	$(OBJS)\corelib_treectlg.obj \
 	$(OBJS)\corelib_treebkg.obj \
 	$(OBJS)\corelib_vlbox.obj \
 	$(OBJS)\corelib_vscroll.obj \
@@ -8960,6 +8952,11 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -9165,11 +9162,6 @@ $(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -9180,11 +9172,6 @@ $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -11431,6 +11418,11 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -11636,11 +11628,6 @@ $(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -11651,11 +11638,6 @@ $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -13848,6 +13830,11 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -14053,11 +14040,6 @@ $(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -14068,11 +14050,6 @@ $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -15295,6 +15272,11 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_textdlg.obj: ..\..\src\common\textdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -15500,11 +15482,6 @@ $(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -15515,11 +15492,6 @@ $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
diff --git a/configure b/configure
index f4e7db22ca..7f0f345d42 100755
--- a/configure
+++ b/configure
@@ -709,6 +709,9 @@ COND_TOOLKIT_WINCE_WXUNIV_0
 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_WINCE_USE_GUI_1
 COND_TOOLKIT_WINCE
+COND_TOOLKIT_Qt
+COND_TOOLKIT_QT_USE_GUI_1
+COND_TOOLKIT_QT
 COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_OSX_IPHONE_USE_GUI_1
 COND_TOOLKIT_OSX_IPHONE
@@ -910,6 +913,7 @@ CPPUNIT_LIBS
 CPPUNIT_CFLAGS
 HOST_SUFFIX
 HEADER_PAD_OPTION
+SAMPLES_CXXFLAGS
 SAMPLES_RPATH_FLAG
 DYLIB_RPATH_POSTLINK
 DYLIB_RPATH_INSTALL
@@ -1088,6 +1092,7 @@ with_msw
 with_directfb
 with_microwin
 with_x11
+with_qt
 enable_nanox
 enable_gpe
 with_libpng
@@ -2311,6 +2316,7 @@ Optional Packages:
   --with-directfb         use DirectFB
   --with-microwin         use MicroWindows
   --with-x11              use X11
+  --with-qt               use Qt
   --with-libpng           use libpng (PNG image format)
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
@@ -3830,7 +3836,7 @@ USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB QT"
 
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
@@ -3841,6 +3847,7 @@ DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_X11=0
 DEFAULT_wxUSE_DFB=0
+DEFAULT_wxUSE_QT=0
 
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
@@ -3851,8 +3858,10 @@ DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_X11=0
 DEFAULT_DEFAULT_wxUSE_DFB=0
+DEFAULT_DEFAULT_wxUSE_QT=0
 
 PROGRAM_EXT=
+SAMPLES_CXXFLAGS=
 SAMPLES_RPATH_FLAG=
 DYLIB_RPATH_INSTALL=
 DYLIB_RPATH_POSTLINK=
@@ -4575,6 +4584,12 @@ if test "${with_x11+set}" = set; then :
 fi
 
 
+# Check whether --with-qt was given.
+if test "${with_qt+set}" = set; then :
+  withval=$with_qt; wxUSE_QT="$withval" CACHE_QT=1 TOOLKIT_GIVEN=1
+fi
+
+
           enablestring=
           defaultval=
           if test -z "$defaultval"; then
@@ -4709,7 +4724,9 @@ if test "$wxUSE_GUI" = "yes"; then
 
             NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
                   + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
-                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \
+                  + ${wxUSE_X11:-0} + ${wxUSE_QT:-0}`
+
 
     case "$NUM_TOOLKITS" in
       1)
@@ -26200,6 +26217,19 @@ $as_echo "none" >&6; }
         TOOLKIT=OSX_IPHONE
     fi
 
+
+    if test "$wxUSE_QT" = 1; then
+        TOOLKIT=QT
+        GUIDIST=QT_DIST
+        TOOLKIT_DIR="qt"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXQT__"
+        TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} `pkg-config Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test --cflags` -DQT_WIDGETS_LIB"
+        GUI_TK_LIBRARY="${GUI_TK_LIBRARY} `pkg-config Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test --libs`"
+        if `pkg-config --variable qt_config Qt5Core | grep "reduce_relocations" >/dev/null`; then
+                        SAMPLES_CXXFLAGS="-fPIC $SAMPLES_CXXFLAGS"
+            WXCONFIG_CXXFLAGS="-fPIC $WXCONFIG_CXXFLAGS $TOOLKIT_INCLUDE"
+        fi
+    fi
         TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'`
 
     if test "$wxUSE_UNIVERSAL" = "yes"; then
@@ -27389,7 +27419,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
-    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1; then
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
 
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL headers" >&5
 $as_echo_n "checking for OpenGL headers... " >&6; }
@@ -32725,6 +32755,12 @@ _ACEOF
 
 fi
 
+if test "$WXQT" = 1 ; then
+  cat >>confdefs.h <<_ACEOF
+#define __WXQT__ $WXQT
+_ACEOF
+
+fi
 DEBUG_CFLAGS=
 if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
                     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5
@@ -36663,7 +36699,7 @@ $as_echo "$wx_cv_lib_gdiplus" >&6; }
         if test "$wx_cv_lib_gdiplus" = "yes"; then
             wx_has_graphics=1
         fi
-    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
@@ -37124,7 +37160,7 @@ $as_echo "$wx_cv_target_x86_64" >&6; }
         fi
     fi
 fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1; then
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
     EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
 fi
 
@@ -37391,6 +37427,7 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
 
 
 
+
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
@@ -39814,6 +39851,21 @@ EOF
         COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_QT="#"
+    if test "x$TOOLKIT" = "xQT" ; then
+        COND_TOOLKIT_QT=""
+    fi
+
+    COND_TOOLKIT_QT_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_QT_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_Qt="#"
+    if test "x$TOOLKIT" = "xQt" ; then
+        COND_TOOLKIT_Qt=""
+    fi
+
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then
         COND_TOOLKIT_WINCE=""
diff --git a/configure.in b/configure.in
index 5aff347634..404420ed4f 100644
--- a/configure.in
+++ b/configure.in
@@ -99,7 +99,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 dnl the list of all available toolkits
 dnl
 dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB QT"
 
 dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
 dnl     which are either yes or no
@@ -112,6 +112,7 @@ DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_X11=0
 DEFAULT_wxUSE_DFB=0
+DEFAULT_wxUSE_QT=0
 
 dnl these are the values which are really default for the given platform:
 dnl they're used if no --with-<toolkit> options were given to detect the
@@ -125,8 +126,10 @@ DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_X11=0
 DEFAULT_DEFAULT_wxUSE_DFB=0
+DEFAULT_DEFAULT_wxUSE_QT=0
 
 PROGRAM_EXT=
+SAMPLES_CXXFLAGS=
 SAMPLES_RPATH_FLAG=
 DYLIB_RPATH_INSTALL=
 DYLIB_RPATH_POSTLINK=
@@ -440,6 +443,7 @@ AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MS
 AC_ARG_WITH(directfb,      [  --with-directfb         use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(qt,            [  --with-qt               use Qt], [wxUSE_QT="$withval" CACHE_QT=1 TOOLKIT_GIVEN=1])
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
 WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
 
@@ -494,7 +498,9 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl this? what about using ALL_TOOLKITS? TODO)
     NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
                   + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
-                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \
+                  + ${wxUSE_X11:-0} + ${wxUSE_QT:-0}`
+
 
     case "$NUM_TOOLKITS" in
       1)
@@ -3285,6 +3291,20 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
         TOOLKIT=OSX_IPHONE
     fi
 
+
+    if test "$wxUSE_QT" = 1; then
+        TOOLKIT=QT
+        GUIDIST=QT_DIST
+        TOOLKIT_DIR="qt"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXQT__"
+        TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} `pkg-config Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test --cflags` -DQT_WIDGETS_LIB"
+        GUI_TK_LIBRARY="${GUI_TK_LIBRARY} `pkg-config Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test --libs`"
+        if `pkg-config --variable qt_config Qt5Core | grep "reduce_relocations" >/dev/null`; then
+            dnl build with position independent code if Qt needs it
+            SAMPLES_CXXFLAGS="-fPIC $SAMPLES_CXXFLAGS"
+            WXCONFIG_CXXFLAGS="-fPIC $WXCONFIG_CXXFLAGS $TOOLKIT_INCLUDE"
+        fi
+    fi
     dnl the name of the directory where the files for this toolkit live
     TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'`
 
@@ -3419,7 +3439,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
-    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1; then
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
 
         dnl adjust CPPFLAGS to include GL/gl.h location if necessary
         dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
@@ -5004,6 +5024,9 @@ if test "$WXGPE" = 1 ; then
   AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE)
 fi
 
+if test "$WXQT" = 1 ; then
+  AC_DEFINE_UNQUOTED(__WXQT__,$WXQT)
+fi
 dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
 dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
 DEBUG_CFLAGS=
@@ -7209,7 +7232,7 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
         if test "$wx_cv_lib_gdiplus" = "yes"; then
             wx_has_graphics=1
         fi
-    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1; then
         PKG_CHECK_MODULES(CAIRO, cairo,
             [wx_has_graphics=1],
             [AC_MSG_WARN([Cairo library not found])]
@@ -7478,7 +7501,7 @@ if test "$wxUSE_MAC" = 1 ; then
         fi
     fi
 fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1; then
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
     EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
 fi
 
@@ -7726,6 +7749,7 @@ AC_SUBST(TOOLKIT_VERSION)
 AC_SUBST(DYLIB_RPATH_INSTALL)
 AC_SUBST(DYLIB_RPATH_POSTLINK)
 AC_SUBST(SAMPLES_RPATH_FLAG)
+AC_SUBST(SAMPLES_CXXFLAGS)
 AC_SUBST(HEADER_PAD_OPTION)
 AC_SUBST(HOST_SUFFIX)
 AC_SUBST(CPPUNIT_CFLAGS)
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index dd40c30ec5..4d4bc80fae 100644
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 BOMBS_OBJECTS =  \
 	bombs_bombs.o \
 	bombs_bombs1.o \
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 48ef93eb8a..0a965941e4 100644
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -37,6 +37,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -48,7 +49,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 FORTY_OBJECTS =  \
 	forty_forty.o \
 	forty_canvas.o \
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 6a5fe91fe0..617b8f55a8 100644
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 FRACTAL_OBJECTS =  \
 	fractal_fractal.o \
 	$(__fractal___win32rc)
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index f13aac1f48..ca4431ef01 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
 	life_life.o \
 	life_dialogs.o \
diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 0f864f8b00..8453c12ede 100644
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -38,7 +38,7 @@
 // resources
 // --------------------------------------------------------------------------
 
-#ifndef wxHAS_IMAGES_IN_RESOURCES
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     // application icon
     #include "mondrian.xpm"
 
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index 2e59776a7f..c76c9aa0a4 100644
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WXPOEM_OBJECTS =  \
 	wxpoem_wxpoem.o \
 	$(__wxpoem___win32rc)
diff --git a/docs/changes.txt b/docs/changes.txt
index fa22a0eb19..5dfa97e803 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -27,6 +27,9 @@ Changes in behaviour which may result in build errors
 3.1.0: (released 2014-xx-xx)
 ----------------------------
 
+- wxQt branch implementing Qt5-based port of wxWidgets API was merged into
+  the trunk (Mariano Reingart, Google Summer of Code project).
+
 All:
 
 - Allow iterating over wxCmdLineParser arguments in order (Armel Asselin).
diff --git a/docs/index.htm b/docs/index.htm
index a96ac1de06..b6e0dc4820 100644
--- a/docs/index.htm
+++ b/docs/index.htm
@@ -47,6 +47,7 @@
       <a href="mac/readme.txt">wxMac</a>,
       <a href="cocoa/readme.txt">wxCocoa</a>,
       <a href="motif/readme.txt">wxMotif</a>,
+      <a href="qt/readme.txt">wxQt</a>
       <a href="x11/readme.txt">wxX11</a>,
       <a href="univ/readme.txt">Univ</a>
     </li>
@@ -57,6 +58,7 @@
       <a href="x11/install.txt">wxX11</a>,
       <a href="mac/install.txt">wxMac</a>,
       <a href="cocoa/install.txt">wxCocoa</a>,
+      <a href="qt/install.txt">wxQt</a>,
     </li>
     <li><a href="changes.txt"><b>General change log</b></a></li>
     <li>Licence:
diff --git a/docs/qt/install.txt b/docs/qt/install.txt
new file mode 100644
index 0000000000..3bed60b9a5
--- /dev/null
+++ b/docs/qt/install.txt
@@ -0,0 +1,175 @@
+wxWidgets for Qt installation
+-----------------------------
+
+IMPORTANT NOTE:
+
+  If you experience problems installing, please re-read these
+  instructions and other related files (todo.txt, bugs.txt and
+  osname.txt for your platform if it exists) carefully before
+  mailing wxwin-users or the author. Preferably, try to fix the
+  problem first and then send a patch to the author.
+
+  When sending bug reports tell us what version of wxWidgets you are
+  using (including the beta) and what compiler on what system. One
+  example: wxQt 3.1.0, GCC 4.8.1, Ubuntu 14.04
+
+* The simplest case
+-------------------
+
+If you compile wxWidgets on Linux for the first time and don't like to read
+install instructions just do (in the base dir):
+
+> mkdir buildqt
+> cd buildqt
+> ../configure --with-qt
+> make
+> su <type root password>
+> make install
+> ldconfig
+[if you get "ldconfig: command not found", try using "/sbin/ldconfig"]
+
+If you don't do the 'make install' part, you can still use the libraries from
+the buildgtk directory, but they may not be available to other users.
+
+If you want to remove wxWidgets on Unix you can do this:
+
+> su <type root password>
+> make uninstall
+> ldconfig
+
+* The simplest errors
+---------------------
+
+For any configure errors: please look at config.log file which was generated
+during configure run, it usually contains some useful information.
+
+configure reports, that you don't have Qt  installed although you are very 
+sure you have. Well, you have installed it, but you also have another
+version of the Qt installed, which you may need to remove. Or maybe you 
+installed it in a non-default location and configure can't find it there, 
+so please check that your PATH variable includes the path to the correct 
+qtconfig/pkg-config. Also check that your LD_LIBRARY_PATH or equivalent 
+variable contains the path to Qt libraries if they were installed in a 
+non-default location.
+
+* The simplest program
+----------------------
+
+Now create your super-application myfoo.cpp and compile anywhere with
+
+g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
+
+* GUI libraries
+---------------
+
+wxWidgets/Qt requires the Qt library to be installed on your system. It has
+to be a stable version, preferably Qt 5.2.1 or later.
+
+* Building wxQT on Ubuntu
+-------------------------
+
+Install latest Qt5 packages (qt5-default). To build unit tests, libcppunit-dev
+is required. You will need to install other dependencies to compile wxWidgets
+depending on the features you'll want to use (build-essential libjpeg-dev 
+libtiff5-dev ubuntu-restricted-extras freeglut3 freeglut3-dev libsdl1.2-dev
+libgstreamer-plugins-base0.10-dev)
+
+
+Then create a build directory, configure and compile:
+
+mkdir bldqt5
+cd bldqt5
+../configure --with-qt --enable-debug
+make
+make samples
+
+If everything is ok, you can do the make install as specified before.
+
+Optionally, you can build and run Unit Tests:
+
+cd tests
+make
+./test_gui
+
+* Building wxGT on Android
+--------------------------
+
+Download Android Native Development Kit (NDK), tandalone Android Software
+Development Kit (SDK), install them and perform the following instructions to
+prepare the cross-compilation tool-chain to (change NDK and other paths):
+
+NDK=~/src/android-ndk-r9d
+SDK=~/src/android-sdk-linux
+export ANDROID_NDK_ROOT=$NDK
+$NDK/build/tools/make-standalone-toolchain.sh \
+    --toolchain=arm-linux-androideabi-4.8 --platform=android-9 \
+    --install-dir=/tmp/ndk
+
+export PATH=/tmp/ndk/bin:$PATH
+export CC=arm-linux-androideabi-gcc  
+export CXX=arm-linux-androideabi-g++ 
+
+
+Also, you'll need to download the Qt library bundle that matches your operating
+system installed package (5.2.1 in this case installed in ~/src/qt, you'll need 
+the android_armv5/ android_armv7/ android_x86/ pre-compiled folders to
+cross-compile for that architectures)
+
+Then, create a build directory (under the wxWidgets folder), configure for 
+Andrid (disable currently unsupported/uneeded features) and run make:
+
+cd ~/src/wxWidgets
+mkdir bldqt5droid
+cd bldqt5droid
+../configure --with-qt --enable-debug  --build=x86_64-unknown-linux-gnu \
+    --host=arm-linux-androideabi  --disable-compat28 --disable-shared \
+    --disable-arttango --enable-image --disable-dragimage --disable-sockets \
+    --with-libtiff=no --without-opengl --disable-baseevtloop --disable-utf8 
+make
+
+You can now compile and link your app against this build, and finally
+package it for Android using standard APK tools.
+
+* Create your configuration
+---------------------------
+
+Usage:
+    ./configure options
+
+If you want to use system's C and C++ compiler,
+set environment variables CC and CXX as
+
+    % setenv CC cc
+    % setenv CXX CC
+    % ./configure [options]
+
+to see all the options please use:
+
+    ./configure --help
+
+It is recommended to build wxWidgets in another directory (maybe a
+subdirectory of your wxWidgets installation) as this allows you to
+have multiple configurations (for example, debug and release or GTK
+and Motif) simultaneously.
+
+* Feature Options
+-----------------
+
+When producing an executable that is linked statically with wxQt
+you'll be surprised at its immense size. This can sometimes be
+drastically reduced by removing features from wxWidgets that
+are not used in your program. 
+
+Please see the output of "./configure --help" for comprehensive list
+of all configurable options.
+
+Apart from disabling certain features you can very often "strip"
+the program of its debugging information resulting in a significant
+reduction in size.
+
+----------------------
+
+In the hope that it will be useful,
+
+    The wxWidgets Team
+
diff --git a/docs/qt/readme.txt b/docs/qt/readme.txt
new file mode 100644
index 0000000000..8f779b24f7
--- /dev/null
+++ b/docs/qt/readme.txt
@@ -0,0 +1,52 @@
+   Welcome to wxWidgets for Qt
+   ---------------------------
+
+You have downloaded the Qt port of the wxWidgets GUI library.
+
+It is required to use at least Qt 5 and some features are
+only available when using Qt 5.2 or higher. 
+
+More info about the wxWidgets project (including all the
+other ports and version of wxWidgets) can be found at the
+main wxWidgets homepage at:
+
+                  http://www.wxwidgets.org/
+  
+Information on how to install can be found in the file 
+INSTALL.txt, but if you cannot wait, this should work on
+many systems:
+
+    mkdir build_qt
+    cd build_qt
+    ../configure --with-qt
+    make
+    su <type root password>
+    make install
+    ldconfig
+
+Please note that it is strongly advised to build the library in
+a separate directory, as shown above, as it allows you to have
+different builds of it (for example with and without debug) in
+parallel. If you build in the source directory, don't forget to
+do "make clean" before changing the configuration!
+
+When you run into problems, please read the INSTALL.txt and 
+follow those instructions. If you still don't have any success,
+please send a bug report to one of our mailing list, INCLUDING 
+A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR 
+VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR 
+WAS REPORTED. I know this has no effect, but I tried...
+
+Please send problems concerning installation, feature requests, 
+bug reports or comments to the wxWidgets users list. These can
+be found at http://www.wxwidgets.org and more specifically at 
+http://lists.wxwidgets.org.
+
+wxWidgets doesn't come with any guarantee whatsoever. It 
+might crash your harddisk or destroy your monitor. It doesn't 
+claim to be suitable for any special or general purpose.
+
+  Regards,
+
+    The wxWidgets Team
+
diff --git a/docs/readme.txt b/docs/readme.txt
index 5cd5534b41..c2f4bcac9b 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -54,6 +54,7 @@ There is some support for the following platforms:
 - Most Unix variants with X11
 - Most Unix variants with Motif/Lesstif
 - Most Unix variants with GTK+ 1.2
+- Most Unix variants with Qt 5 or newer
 
 Most popular C++ compilers are supported; see the install.txt
 file for each platform (available via docs/html/index.htm) and
@@ -114,9 +115,9 @@ application binaries. To answer a FAQ, you don't have to
 distribute any source if you wish to write commercial
 applications using wxWidgets.
 
-However, if you distribute wxGTK or wxMotif (with Lesstif)
+However, if you distribute wxGTK, wxQt or wxMotif (with Lesstif)
 version of your application, don't forget that it is linked
-against GTK+ (or Lesstif) which is covered by LGPL *without*
+against GTK+, Qt or Lesstif, which are covered by LGPL *without*
 exception notice and so is bound by its requirements.
 
 If you use TIFF image handler, please see src/tiff/COPYRIGHT
@@ -174,4 +175,4 @@ If you are looking for support, you can get it from
 
 Have fun!
 
-The wxWidgets Team, November 2013
+The wxWidgets Team, August 2014
diff --git a/include/wx/accel.h b/include/wx/accel.h
index afe27ef4f3..604039561f 100644
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -164,6 +164,8 @@ private:
     #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/accel.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/accel.h"
 #endif
 
 extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
diff --git a/include/wx/android/chkconf.h b/include/wx/android/chkconf.h
index 73c631b0b3..5ad1922596 100644
--- a/include/wx/android/chkconf.h
+++ b/include/wx/android/chkconf.h
@@ -12,6 +12,11 @@
 #ifndef _WX_ANDROID_CHKCONF_H_
 #define _WX_ANDROID_CHKCONF_H_
 
+// For Qt under Android, use default configuration procedure as most features
+// should be supported (see documentation for more information)
+
+#ifndef __WXQT__
+
 // ----------------------------------------------------------------------------
 // Disable features which don't work (yet) or don't make sense under Android.
 // ----------------------------------------------------------------------------
@@ -226,5 +231,6 @@
 #undef wxUSE_PRINTING_ARCHITECTURE
 #define wxUSE_PRINTING_ARCHITECTURE 0
 
+#endif // __WXQT__
 
 #endif // _WX_ANDROID_CHKCONF_H_
diff --git a/include/wx/android/config_android.h b/include/wx/android/config_android.h
index e94d09360f..eebbb1ad40 100644
--- a/include/wx/android/config_android.h
+++ b/include/wx/android/config_android.h
@@ -13,6 +13,12 @@
 // 'fine-tuned' on a trial-and-error basis. This means, no in-depth analysis
 // of Android docs / source was done.
 
+// For Qt under Android, use the default configuration procedure as most
+// features should be supported and the following fixed definitions will
+// cause compiler warnings or other issues.
+
+#if !defined(__WXQT__)
+
 #define wxUSE_UNIX 1
 #define __UNIX__ 1
 
@@ -53,3 +59,5 @@
 // Android doesn't support pthread_cancel().
 #undef HAVE_PTHREAD_CANCEL
 #endif
+
+#endif
diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
index 2da90823d4..50066bd1e8 100644
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/setup.h
-// Purpose:     Configuration for the universal build of the library
+// Name:        wx/android/setup.h
+// Purpose:     Configuration for the android build of the library
 // Author:      Julian Smart
 // Created:     01/02/97
 // Copyright:   (c) Julian Smart
diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h
index b931797e3f..9f170b9a95 100644
--- a/include/wx/anybutton.h
+++ b/include/wx/anybutton.h
@@ -186,6 +186,8 @@ protected:
 //    #include "wx/gtk1/anybutton.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/anybutton.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/anybutton.h"
 #else
     typedef wxAnyButtonBase wxAnyButton;
 #endif
diff --git a/include/wx/app.h b/include/wx/app.h
index e3a6ba627e..b8ae61fc22 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -706,6 +706,8 @@ protected:
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/app.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/app.h"
 #endif
 
 #else // !GUI
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 92b205c620..8ab8ec23c0 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -72,7 +72,8 @@ protected:
     defined(__WXMAC__) || \
     defined(__WXGTK__) || \
     defined(__WXMOTIF__) || \
-    defined(__WXX11__)
+    defined(__WXX11__) || \
+    defined(__WXQT__)
     #define wxUSE_BITMAP_BASE 1
 #else
     #define wxUSE_BITMAP_BASE 0
@@ -286,6 +287,9 @@ protected:
 #elif defined(__WXMAC__)
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_PICT_RESOURCE
     #include "wx/osx/bitmap.h"
+#elif defined(__WXQT__)
+    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
+    #include "wx/qt/bitmap.h"
 #endif
 
 #if wxUSE_IMAGE
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index b1988d9b6c..83fd4f1a7f 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -20,7 +20,7 @@
 // FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton
 //        itself, this shouldn't be used for the other platforms neither
 //        when all of them do it
-#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
+#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__) || defined(__WXQT__)) && !defined(__WXUNIVERSAL__)
     #define wxHAS_BUTTON_BITMAP
 #endif
 
@@ -123,6 +123,8 @@ protected:
     #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/bmpbuttn.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/bmpbuttn.h"
 #endif
 
 #endif // wxUSE_BMPBUTTON
diff --git a/include/wx/brush.h b/include/wx/brush.h
index 0135b7b6f4..c4fb1da273 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -81,6 +81,8 @@ public:
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/brush.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/brush.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
diff --git a/include/wx/button.h b/include/wx/button.h
index 6f59c3eef9..f31166413e 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -58,6 +58,8 @@ protected:
     #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/button.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/button.h"
 #endif
 
 #endif // wxUSE_BUTTON
diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h
index 54775b3ed7..85910363a7 100644
--- a/include/wx/calctrl.h
+++ b/include/wx/calctrl.h
@@ -348,6 +348,9 @@ protected:
     #elif defined(__WXMSW__)
         #define wxHAS_NATIVE_CALENDARCTRL
         #include "wx/msw/calctrl.h"
+    #elif defined(__WXQT__)
+        #define wxHAS_NATIVE_CALENDARCTRL
+        #include "wx/qt/calctrl.h"
     #endif
 #endif // !__WXUNIVERSAL__
 
diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index d0b0ca77b9..e8ccb35f05 100644
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -67,6 +67,23 @@
         }
     #endif /* Cygwin and C++ */
 
+    /* the current (as of Mar 2014) version of Android (up to api level 19) */
+    /* doesn't include some declarations (wscdup, wcslen, wcscasecmp, etc.) */
+    /* (moved out from __CYGWIN__ block) */
+    #if defined(__WXQT__) && !defined(wcsdup) && defined(__ANDROID__)
+        #ifdef __cplusplus
+            extern "C" {
+        #endif
+            extern wchar_t *wcsdup(const wchar_t *);
+            extern size_t wcslen (const wchar_t *);
+            extern size_t wcsnlen (const wchar_t *, size_t );
+            extern int wcscasecmp (const wchar_t *, const wchar_t *);
+            extern int wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
+        #ifdef __cplusplus
+            }
+        #endif
+    #endif /* Android */
+
 #elif defined(HAVE_WCSTR_H)
     /* old compilers have relevant declarations here */
     #include <wcstr.h>
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index f66d32b537..00e73dca9e 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -178,6 +178,8 @@ private:
     #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/checkbox.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/checkbox.h"
 #endif
 
 #endif // wxUSE_CHECKBOX
diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 5349cc53e3..0dda8cd288 100644
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -55,6 +55,8 @@ public:
     #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/checklst.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/checklst.h"
 #endif
 
 #endif // wxUSE_CHECKLISTBOX
diff --git a/include/wx/choice.h b/include/wx/choice.h
index f796bfcd83..4b985746a8 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -86,6 +86,8 @@ private:
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/choice.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/choice.h"
 #endif
 
 #endif // wxUSE_CHOICE
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index a468ce2720..6786427b5d 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -161,6 +161,8 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
     #include "wx/x11/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/clipbrd.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/clipbrd.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index 7d43dc2551..1ed49a8419 100644
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -79,6 +79,8 @@ protected:
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/clrpicker.h"
     #define wxColourPickerWidget      wxColourButton
+#elif defined(__WXQT__) && !defined(__WXUNIVERSAL__)
+    #include "wx/qt/clrpicker.h"
 #else
     #include "wx/generic/clrpickerg.h"
     #define wxColourPickerWidget      wxGenericColourButton
diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 4762c8cf52..7eb7cc9a42 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -23,6 +23,8 @@
     #include "wx/osx/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/colordlg.h"
 #else
     #include "wx/generic/colrdlgg.h"
 
diff --git a/include/wx/colour.h b/include/wx/colour.h
index f164209c16..1651f63d44 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -219,6 +219,8 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
     #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/colour.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/colour.h"
 #endif
 
 #define wxColor wxColour
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index ab445c3299..425a68f8f4 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -81,6 +81,8 @@ public:
     #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/combobox.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/combobox.h"
 #endif
 
 #endif // wxUSE_COMBOBOX
diff --git a/include/wx/control.h b/include/wx/control.h
index 7c22cdeb07..a90a799dda 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -236,6 +236,8 @@ protected:
     #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/control.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/control.h"
 #endif
 
 #endif // wxUSE_CONTROLS
diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 4ae66a7d62..c5a82c9ae7 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -462,6 +462,8 @@ private:
     #include "wx/msw/ctrlsub.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/ctrlsub.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/ctrlsub.h"
 #else
     class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase
     {
diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index 58a706ca3a..e48efe354b 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -58,6 +58,9 @@ public:
 #elif defined(__WXMAC__)
     #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
     #include "wx/osx/cursor.h"
+#elif defined(__WXQT__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR
+    #include "wx/qt/cursor.h"
 #endif
 
 #include "wx/utils.h"
diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index dba3ce4783..d407dd5149 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -83,6 +83,8 @@ public:
     #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/dataform.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/dataform.h"
 #endif
 
 // the value for default argument to some functions (corresponds to
@@ -167,6 +169,8 @@ public:
     #include "wx/gtk1/dataobj.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/dataobj.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/dataobj.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -556,6 +560,8 @@ private:
         #include "wx/motif/dataobj2.h"
     #elif defined(__WXMAC__)
         #include "wx/osx/dataobj2.h"
+    #elif defined(__WXQT__)
+        #include "wx/qt/dataobj2.h"
     #endif
 
     // wxURLDataObject is simply wxTextDataObject with a different name
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index b5b74b00b0..22e929cf3f 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -29,7 +29,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
-#if !(defined(__WXGTK20__) || defined(__WXOSX__)) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || defined(__WXOSX__) ) || defined(__WXUNIVERSAL__)
 // #if !(defined(__WXOSX__)) || defined(__WXUNIVERSAL__)
     #define wxHAS_GENERIC_DATAVIEWCTRL
 #endif
@@ -948,6 +948,8 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/dataview.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/dataview.h"
 #else
     #error "unknown native wxDataViewCtrl implementation"
 #endif
diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index f4d27c7fb8..752c0d81ae 100644
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -17,7 +17,7 @@
 
 // Split platforms into two groups - those which have well-working
 // double-buffering by default, and those which do not.
-#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__)
+#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) || defined(__WXQT__)
     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
 #else
     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       0
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6a47a26245..96d0ab2a79 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -32,6 +32,7 @@
          !defined(__X__)       && \
          !defined(__WXDFB__)   && \
          !defined(__WXX11__)   && \
+         !defined(__WXQT__)    && \
           wxUSE_GUI
 #       ifdef __UNIX__
 #           error "No Target! You should use wx-config program for compilation flags!"
@@ -3303,6 +3304,10 @@ typedef struct _PangoFontDescription PangoFontDescription;
 typedef const void* WXWidget;
 #endif /*  DFB */
 
+#ifdef __WXQT__
+#include "wx/qt/defs.h"
+#endif
+
 /*  This is required because of clashing macros in windows.h, which may be */
 /*  included before or after wxWidgets classes, and therefore must be */
 /*  disabled here before any significant wxWidgets headers are included. */
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 770902577d..603b3cba66 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -360,6 +360,8 @@ public:
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)
         #include "wx/osx/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 bf16a50916..70c5be92ec 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -107,6 +107,8 @@ protected:
       defined(__WXX11__)
     #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
     #define wxDirDialog wxGenericDirDialog
+#elif defined(__WXQT__)
+    #include "wx/qt/dirdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index ab283435bb..2f3f333329 100644
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -222,6 +222,8 @@ protected:
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/dnd.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/dnd.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index cc3e88d04d..4f8bc6a717 100644
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -41,6 +41,10 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
 #   include "wx/generic/dragimgg.h"
 #   define wxDragImage wxGenericDragImage
 
+#elif defined(__WXQT__)
+#   include "wx/generic/dragimgg.h"
+#   define wxDragImage wxGenericDragImage
+
 #endif
 
 #endif // wxUSE_DRAGIMAGE
diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 775bc1a2d8..3de00f058e 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -208,6 +208,8 @@ protected:
         #include "wx/gtk/dvrenderer.h"
     #elif defined(__WXMAC__)
         #include "wx/osx/dvrenderer.h"
+    #elif defined(__WXQT__)
+        #include "wx/qt/dvrenderer.h"
     #else
         #error "unknown native wxDataViewCtrl implementation"
     #endif
@@ -332,6 +334,8 @@ private:
     #include "wx/gtk/dvrenderers.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/dvrenderers.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/dvrenderers.h"
 #else
     #error "unknown native wxDataViewCtrl implementation"
 #endif
diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index f3a158982c..66b00034e5 100644
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -37,7 +37,8 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || \
-    defined(__WXMAC__)
+    defined(__WXMAC__) || \
+    defined(__WXQT__)
 
     wxNativeEncodingInfo()
         : facename()
diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index ec109f9e17..9b2b731e10 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -296,6 +296,8 @@ private:
     #include "wx/dfb/evtloop.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/evtloop.h"
+    #elif defined(__WXQT__)
+    #include "wx/qt/evtloop.h"
 #else // other platform
 
 #include "wx/stopwatch.h"   // for wxMilliClock_t
diff --git a/include/wx/evtloopsrc.h b/include/wx/evtloopsrc.h
index cb3e5c6a90..6b7f2b1fdd 100644
--- a/include/wx/evtloopsrc.h
+++ b/include/wx/evtloopsrc.h
@@ -12,7 +12,6 @@
 
 // Include the header to get wxUSE_EVENTLOOP_SOURCE definition from it.
 #include "wx/evtloop.h"
-
 // ----------------------------------------------------------------------------
 // wxEventLoopSource: a source of events which may be added to wxEventLoop
 // ----------------------------------------------------------------------------
@@ -95,6 +94,8 @@ inline wxEventLoopSource::~wxEventLoopSource() { }
 
 #if defined(__DARWIN__)
     #include "wx/osx/evtloopsrc.h"
+#elif defined(__WXQT__)
+     #include "wx/unix/evtloopsrc.h"
 #endif
 
 #endif // wxUSE_EVENTLOOP_SOURCE
diff --git a/include/wx/features.h b/include/wx/features.h
index 439bd84544..ec65e6c513 100644
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -34,7 +34,7 @@
 /*  taskbar is implemented in the major ports */
 #if defined(__WXMSW__) \
     || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
-    || defined(__WXOSX_MAC__)
+    || defined(__WXOSX_MAC__) || defined(__WXQT__)
     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxUSE_TASKBARICON
@@ -69,7 +69,7 @@
 
 /* This is defined when the underlying toolkit handles tab traversal natively.
    Otherwise we implement it ourselves in wxControlContainer. */
-#ifdef __WXGTK20__
+#if defined(__WXGTK20__) || defined(__WXQT__)
     #define wxHAS_NATIVE_TAB_TRAVERSAL
 #endif
 
@@ -85,7 +85,7 @@
 
 /* Direct access to bitmap data is not implemented in all ports yet */
 #if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \
-        defined(__WXMSW__)
+        defined(__WXMSW__) || defined(__WXQT__)
 
     /*
        HP aCC for PA-RISC can't deal with templates in wx/rawbmp.h.
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 10c812fac5..37643f0c0e 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -218,6 +218,8 @@ wxSaveFileSelector(const wxString& what,
     #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/filedlg.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/filedlg.h"
 #endif
 
 #endif // wxUSE_FILEDLG
diff --git a/include/wx/font.h b/include/wx/font.h
index e464683d32..cbd3cada8f 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -530,6 +530,8 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
     #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/font.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/font.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase
diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 882b54ff85..d1764efb91 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -78,6 +78,8 @@ protected:
     #include "wx/gtk1/fontdlg.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/fontdlg.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/frame.h b/include/wx/frame.h
index e63ec5f5ef..920d12fea0 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -264,6 +264,8 @@ protected:
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
         #include "wx/osx/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 2da064052d..ccfb873d7e 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -26,6 +26,8 @@
 
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
+// QT only, display current completed percentage (text default format "%p%")
+#define wxGA_TEXT            0x0040
 
 // GTK and Mac always have native implementation of the indeterminate mode
 // wxMSW has native implementation only if comctl32.dll >= 6.00
@@ -109,6 +111,8 @@ protected:
     #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/gauge.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/gauge.h"
 #endif
 
 #endif // wxUSE_GAUGE
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index e94485b5c5..bf4dbbbb76 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -191,6 +191,9 @@ enum wxStockCursor
 #elif defined(__WXX11__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
+#elif defined(__WXQT__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( X##_xpm )
 #else
     // This will usually mean something on any platform
     #define wxICON(X) wxIcon(wxT(#X))
diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index cf6b964021..5ba99c131b 100644
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -197,6 +197,8 @@ public:
     #include "wx/gtk1/glcanvas.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/glcanvas.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/glcanvas.h"
 #else
     #error "wxGLCanvas not supported in this wxWidgets port"
 #endif
diff --git a/include/wx/icon.h b/include/wx/icon.h
index 8c34b5563f..0f7c45e904 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -52,6 +52,9 @@
   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_PNG_RESOURCE
   #include "wx/generic/icon.h"
 #endif
+#elif defined(__WXQT__)
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #include "wx/generic/icon.h"
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 562f564f6e..4a93a2518b 100644
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -27,6 +27,8 @@
 #include "wx/osx/core/joystick.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/joystick.h"
+#elif defined(__WXQT__)
+#include "wx/unix/joystick.h"
 #endif
 
 #endif // wxUSE_JOYSTICK
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index c58e744fbb..e602f624ed 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -153,6 +153,8 @@ private:
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/listbox.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/listbox.h"
 #endif
 
 #endif // wxUSE_LISTBOX
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 51aca4a1b1..2feacada5f 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -31,6 +31,8 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
     #include "wx/osx/listctrl.h"
+#elif defined(__WXQT__) && !defined(__WXUNIVERSAL__)
+    #include "wx/qt/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
 #endif
diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 7bc310effd..dd52227d1b 100644
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -366,6 +366,8 @@ public:
     #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/mdi.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/mdi.h"
 #endif
 
 inline wxMDIClientWindow *wxMDIParentFrameBase::OnCreateClient()
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 00a441dd35..c341e5f2d1 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -589,6 +589,8 @@ protected:
     #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/menu.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/menu.h"
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
 
diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index f2ebd81bf1..826086d118 100644
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -204,6 +204,8 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
     #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/menuitem.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/menuitem.h"
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
 
diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 5f5ff7dc2f..bd03bbc939 100644
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows Licence
+// Copyright:   (c) 2014 wxWidgets dev team
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_BASE_
@@ -27,6 +27,8 @@
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/minifram.h"
+#elif defined(__WXQT__)
+#include "wx/qt/minifram.h"
 #else
 // TODO: it seems that wxMiniFrame could be just defined here generically
 //       instead of having all the above port-specific headers
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index b50d55e234..1f802618b7 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -185,7 +185,6 @@ public:
         DoSetCustomLabel(m_help, help);
         return true;
     }
-
     // test if any custom labels were set
     bool HasCustomLabels() const
     {
@@ -300,6 +299,8 @@ private:
     #include "wx/gtk/msgdlg.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/msgdlg.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/msgdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 22c70d1a96..5d358147fd 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -193,6 +193,8 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGING, wxBook
     #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
     #include  "wx/osx/notebook.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/notebook.h"
 #endif
 
 // old wxEVT_COMMAND_* constants
diff --git a/include/wx/palette.h b/include/wx/palette.h
index 7bd91ffd56..00aa960159 100644
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -35,6 +35,8 @@ public:
     #include "wx/generic/paletteg.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/palette.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/palette.h"
 #endif
 
 #endif // wxUSE_PALETTE
diff --git a/include/wx/pen.h b/include/wx/pen.h
index 4dd2c27497..e7eb2ff4a1 100644
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -109,6 +109,8 @@ public:
     #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/pen.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/pen.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index 47d1869b4f..33cd2c58ca 100644
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -78,7 +78,8 @@ enum wxPortId
     wxPORT_MAC      = 1 << 7,       // wxOSX (former wxMac), using Cocoa, Carbon or iPhone API
     wxPORT_OSX      = wxPORT_MAC,   // wxOSX, using Cocoa, Carbon or iPhone API
     wxPORT_COCOA    = 1 << 8,       // wxCocoa, using Cocoa NextStep/Mac API
-    wxPORT_WINCE    = 1 << 9        // wxWinCE, toolkit is WinCE SDK API
+    wxPORT_WINCE    = 1 << 9,       // wxWinCE, toolkit is WinCE SDK API
+    wxPORT_QT       = 1 << 10       // wxQT, using QT4
 };
 
 // architecture of the operating system
@@ -348,4 +349,6 @@ protected:
     wxEndianness m_endian;
 };
 
+
+
 #endif // _WX_PLATINFO_H_
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 7264b99a45..5587c08ec2 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -65,6 +65,8 @@ public:
     #include "wx/dfb/popupwin.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/popupwin.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
diff --git a/include/wx/print.h b/include/wx/print.h
index 40e55faaa0..269f55cba4 100644
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -23,6 +23,10 @@
 
 #include "wx/osx/printmac.h"
 
+
+#elif defined(__WXQT__)
+
+#include "wx/qt/printqt.h"
 #else
 
 #include "wx/generic/printps.h"
diff --git a/include/wx/qt/accel.h b/include/wx/qt/accel.h
new file mode 100644
index 0000000000..4b249171cd
--- /dev/null
+++ b/include/wx/qt/accel.h
@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/accel.h
+// Purpose:     wxAcceleratorTable class
+// Author:      Peter Most, Javier Torres
+// Modified by:
+// Created:     09/08/09
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_ACCEL_H_
+#define _WX_QT_ACCEL_H_
+
+#include <QtCore/QList>
+#include <QtWidgets/QShortcut>
+
+/* wxQt accelerators implementation:
+ *
+ * Storing:
+ * QShortcuts are stored in wxWindow (m_qtShortcuts) to allow to delete them
+ * when the accelerator table is changed, and also because we need to specify
+ * a not-null parent from them, which is unknown at the moment of creating the
+ * accelerator table. So, the accelerator table only contains a list of
+ * wxAcceleratorEntries, which are converted to a list of QShortcuts when
+ * the table is fixed to a wxWindow.
+ *
+ * Passing keypresses to accelerators:
+ * The accelerators are implemented using QShortcut's. As there is no easy way
+ * to call them, we must pass all keypress events through the QApplication
+ * notify() function (which is the one that checks if the keypress match any
+ * shortcut.
+ *
+ * Executing commands when a QShortcut is triggered:
+ * Each QShortcut has a property ("wxQt_Command") set with the number of the
+ * wx command it is associated to. Then, its activated() signal is connected to
+ * a small handler (wxQtShortcutHandler in window_qt.h) which calls the main
+ * handler (wxWindow::QtHandleShortcut) passing the command extracted from the
+ * QShortcut. This handler will finally create and send the appropriate wx
+ * event to the window. */
+
+class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
+{
+public:
+    wxAcceleratorTable();
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
+
+    // Implementation
+    QList< QShortcut* > ConvertShortcutTable( QWidget *parent ) const;
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+
+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    
+private:  
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+};
+
+#endif // _WX_QT_ACCEL_H_
diff --git a/include/wx/qt/anybutton.h b/include/wx/qt/anybutton.h
new file mode 100644
index 0000000000..975ffae6fe
--- /dev/null
+++ b/include/wx/qt/anybutton.h
@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/anybutton.h
+// Purpose:     wxQT wxAnyButton class declaration
+// Author:      Mariano Reingart
+// Copyright:   (c) 2014 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_ANYBUTTON_H_
+#define _WX_QT_ANYBUTTON_H_
+
+#include <QtWidgets/QPushButton>
+
+//-----------------------------------------------------------------------------
+// wxAnyButton
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
+{
+public:
+    wxAnyButton()
+    {
+    }
+
+    // implementation
+    // --------------
+
+    virtual void SetLabel( const wxString &label );
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
+
+    virtual QPushButton *GetHandle() const;
+
+protected:
+
+    QPushButton *m_qtPushButton;
+
+    void QtCreate(wxWindow *parent);
+    void QtSetBitmap( const wxBitmap &bitmap );
+
+private:
+    typedef wxAnyButtonBase base_type;
+
+    wxDECLARE_NO_COPY_CLASS(wxAnyButton);
+};
+
+
+#endif // _WX_QT_ANYBUTTON_H_
diff --git a/include/wx/qt/app.h b/include/wx/qt/app.h
new file mode 100644
index 0000000000..56b3b72d80
--- /dev/null
+++ b/include/wx/qt/app.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        app.h
+// Purpose:     wxApp class
+// Author:      Peter Most
+// Modified by:
+// Created:     08/08/09
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_APP_H_
+#define _WX_QT_APP_H_
+
+#include <QtWidgets/QApplication>
+
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase
+{
+public:
+    wxApp();
+    ~wxApp();
+    
+    virtual bool Initialize(int& argc, wxChar **argv);
+
+private:
+    QApplication *m_qtApplication;
+    int m_qtArgc;
+    char **m_qtArgv;
+    
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxApp );
+};
+    
+#endif // _WX_QT_APP_H_
diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h
new file mode 100644
index 0000000000..f09833c2b5
--- /dev/null
+++ b/include/wx/qt/bitmap.h
@@ -0,0 +1,122 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/bitmap.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_BITMAP_H_
+#define _WX_QT_BITMAP_H_
+
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
+
+class WXDLLIMPEXP_FWD_CORE wxImage;
+class QImage;
+
+class QPixmap;
+class QBitmap;
+
+class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase
+{
+public:
+    wxBitmap();
+    wxBitmap(QPixmap pix);
+    wxBitmap(const wxBitmap& bmp);
+    wxBitmap(const char bits[], int width, int height, int depth = 1);
+    wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+    wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH);
+    wxBitmap(const char* const* bits);
+    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
+    wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);
+
+    static void InitStandardHandlers();
+
+    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH);
+    virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc));
+
+    virtual int GetHeight() const;
+    virtual int GetWidth() const;
+    virtual int GetDepth() const;
+
+#if wxUSE_IMAGE
+    virtual wxImage ConvertToImage() const;
+#endif // wxUSE_IMAGE
+
+    virtual wxMask *GetMask() const;
+    virtual void SetMask(wxMask *mask);
+
+    virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
+
+    virtual bool SaveFile(const wxString &name, wxBitmapType type,
+                          const wxPalette *palette = NULL) const;
+    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
+
+#if wxUSE_PALETTE
+    virtual wxPalette *GetPalette() const;
+    virtual void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
+
+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);
+
+    // implementation:
+    virtual void SetHeight(int height);
+    virtual void SetWidth(int width);
+    virtual void SetDepth(int depth);
+
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);
+
+    // these functions are internal and shouldn't be used, they risk to
+    // disappear in the future
+    bool HasAlpha() const;
+
+    QPixmap *GetHandle() const;
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    DECLARE_DYNAMIC_CLASS(wxBitmap)
+};
+
+class WXDLLIMPEXP_CORE wxMask : public wxObject
+{
+public:
+    wxMask();
+
+    // Copy constructor
+    wxMask(const wxMask &mask);
+
+    // Construct a mask from a bitmap and a colour indicating the transparent
+    // area
+    wxMask(const wxBitmap& bitmap, const wxColour& colour);
+
+    // Construct a mask from a bitmap and a palette index indicating the
+    // transparent area
+    wxMask(const wxBitmap& bitmap, int paletteIndex);
+
+    // Construct a mask from a mono bitmap (copies the bitmap).
+    wxMask(const wxBitmap& bitmap);
+
+
+    virtual ~wxMask();
+
+    bool Create(const wxBitmap& bitmap, const wxColour& colour);
+    bool Create(const wxBitmap& bitmap, int paletteIndex);
+    bool Create(const wxBitmap& bitmap);
+
+    wxBitmap GetBitmap() const;
+
+    // Implementation
+    QBitmap *GetHandle() const;
+
+protected:
+    DECLARE_DYNAMIC_CLASS(wxMask)
+
+private:
+    QBitmap *m_qtBitmap;
+};
+
+#endif // _WX_QT_BITMAP_H_
diff --git a/include/wx/qt/bmpbuttn.h b/include/wx/qt/bmpbuttn.h
new file mode 100644
index 0000000000..85f5afdecd
--- /dev/null
+++ b/include/wx/qt/bmpbuttn.h
@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/bmpbuttn.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_BMPBUTTN_H_
+#define _WX_QT_BMPBUTTN_H_
+
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
+{
+public:
+    wxBitmapButton();
+
+    wxBitmapButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxButtonNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& bitmap,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxButtonNameStr);
+protected:
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
+
+private:
+    // We re-use wxButton
+};
+
+#endif // _WX_QT_BMPBUTTN_H_
diff --git a/include/wx/qt/brush.h b/include/wx/qt/brush.h
new file mode 100644
index 0000000000..e94d4e71fe
--- /dev/null
+++ b/include/wx/qt/brush.h
@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/brush.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_BRUSH_H_
+#define _WX_QT_BRUSH_H_
+
+#include <QtCore/Qt>
+
+class QBrush;
+
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
+{
+public:
+    wxBrush();
+    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+
+    wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
+    wxBrush(const wxColour& col, int style);
+
+    wxBrush(const wxBitmap& stipple);
+
+    virtual void SetColour(const wxColour& col);
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
+    virtual void SetStyle(wxBrushStyle style);
+    virtual void SetStipple(const wxBitmap& stipple);
+
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
+
+    virtual wxColour GetColour() const;
+    virtual wxBrushStyle GetStyle() const;
+    virtual wxBitmap *GetStipple() const;
+
+    wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
+    void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
+    
+    QBrush GetHandle() const;
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+};
+
+#endif // _WX_QT_BRUSH_H_
diff --git a/include/wx/qt/button.h b/include/wx/qt/button.h
new file mode 100644
index 0000000000..0bbce110a4
--- /dev/null
+++ b/include/wx/qt/button.h
@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/button.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_BUTTON_H_
+#define _WX_QT_BUTTON_H_
+
+#include "wx/control.h"
+#include "wx/button.h"
+
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
+{
+public:
+    wxButton();
+    wxButton(wxWindow *parent, wxWindowID id,
+           const wxString& label = wxEmptyString,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID id,
+           const wxString& label = wxEmptyString,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr);
+
+   virtual wxWindow *SetDefault();
+
+private:
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
+};
+
+
+#endif // _WX_QT_BUTTON_H_
diff --git a/include/wx/qt/calctrl.h b/include/wx/qt/calctrl.h
new file mode 100644
index 0000000000..2d2632c8af
--- /dev/null
+++ b/include/wx/qt/calctrl.h
@@ -0,0 +1,94 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/calctrl.h
+// Purpose:     wxCalendarCtrl control implementation for wxQt
+// Author:      Kolya Kosenko
+// Created:     2010-05-12
+// Copyright:   (C) 2010 Kolya Kosenko
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CALCTRL_H_
+#define _WX_QT_CALCTRL_H_
+
+#include "wx/calctrl.h"
+#include <QtWidgets/QCalendarWidget>
+
+class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxCalendarCtrlBase
+{
+public:
+    wxCalendarCtrl() { Init(); }
+    wxCalendarCtrl(wxWindow *parent,
+                   wxWindowID id,
+                   const wxDateTime& date = wxDefaultDateTime,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxCAL_SHOW_HOLIDAYS,
+                   const wxString& name = wxCalendarNameStr)
+    {
+        Init();
+        Create(parent, id, date, pos, size, style, name);
+    }
+
+    virtual ~wxCalendarCtrl();
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxDateTime& date = wxDefaultDateTime,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxCAL_SHOW_HOLIDAYS,
+                const wxString& name = wxCalendarNameStr);
+
+    virtual bool SetDate(const wxDateTime& date);
+    virtual wxDateTime GetDate() const;
+
+    virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
+                              const wxDateTime& upperdate = wxDefaultDateTime);
+    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
+
+    virtual bool EnableMonthChange(bool enable = true);
+    virtual void Mark(size_t day, bool mark);
+
+    // holidays colours
+    virtual void SetHoliday(size_t day);
+    virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg);
+    virtual const wxColour& GetHolidayColourFg() const { return m_colHolidayFg; }
+    virtual const wxColour& GetHolidayColourBg() const { return m_colHolidayBg; }
+
+    // header colours
+    virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg);
+    virtual const wxColour& GetHeaderColourFg() const { return m_colHeaderFg; }
+    virtual const wxColour& GetHeaderColourBg() const { return m_colHeaderBg; }
+
+    // day attributes
+    virtual wxCalendarDateAttr *GetAttr(size_t day) const;
+    virtual void SetAttr(size_t day, wxCalendarDateAttr *attr);
+    virtual void ResetAttr(size_t day) { SetAttr(day, NULL); }
+
+
+    virtual void SetWindowStyleFlag(long style);
+
+    using wxCalendarCtrlBase::GenerateAllChangeEvents;
+
+    virtual QCalendarWidget *GetHandle() const;
+
+protected:
+    virtual void RefreshHolidays();
+
+private:
+    void Init();
+    void UpdateStyle();
+
+    QCalendarWidget *m_qtCalendar;
+    wxColour m_colHeaderFg,
+             m_colHeaderBg,
+             m_colHolidayFg,
+             m_colHolidayBg;
+
+    wxCalendarDateAttr *m_attrs[31];
+
+
+    DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
+};
+
+#endif // _WX_QT_CALCTRL_H_
diff --git a/include/wx/qt/checkbox.h b/include/wx/qt/checkbox.h
new file mode 100644
index 0000000000..aee619f308
--- /dev/null
+++ b/include/wx/qt/checkbox.h
@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/checkbox.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CHECKBOX_H_
+#define _WX_QT_CHECKBOX_H_
+
+#include <QtWidgets/QCheckBox>
+
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
+{
+public:
+    wxCheckBox();
+    wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxCheckBoxNameStr );
+
+    virtual void SetValue(bool value);
+    virtual bool GetValue() const;
+
+    virtual QCheckBox *GetHandle() const;
+
+protected:
+    virtual void DoSet3StateValue(wxCheckBoxState state);
+    virtual wxCheckBoxState DoGet3StateValue() const;
+
+private:
+    QCheckBox *m_qtCheckBox;
+
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
+};
+
+#endif // _WX_QT_CHECKBOX_H_
diff --git a/include/wx/qt/checklst.h b/include/wx/qt/checklst.h
new file mode 100644
index 0000000000..a1b9f1dad6
--- /dev/null
+++ b/include/wx/qt/checklst.h
@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/checklst.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CHECKLST_H_
+#define _WX_QT_CHECKLST_H_
+
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
+{
+public:
+    wxCheckListBox();
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int nStrings = 0,
+            const wxString *choices = (const wxString *)NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+
+
+    virtual ~wxCheckListBox();
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
+                  int n = 0, const wxString choices[] = NULL,
+                  long style = 0,
+                  const wxValidator& validator = wxDefaultValidator,
+                  const wxString& name = wxListBoxNameStr);
+    bool Create(wxWindow *parent, wxWindowID id,
+                  const wxPoint& pos,
+                  const wxSize& size,
+                  const wxArrayString& choices,
+                  long style = 0,
+                  const wxValidator& validator = wxDefaultValidator,
+                  const wxString& name = wxListBoxNameStr);
+
+    virtual bool IsChecked(unsigned int item) const;
+    virtual void Check(unsigned int item, bool check = true);
+
+private:
+    virtual void Init(); //common construction
+
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
+};
+
+#endif // _WX_QT_CHECKLST_H_
diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h
new file mode 100644
index 0000000000..926a57ec30
--- /dev/null
+++ b/include/wx/qt/choice.h
@@ -0,0 +1,81 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/choice.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CHOICE_H_
+#define _WX_QT_CHOICE_H_
+
+#include <QtWidgets/QComboBox>
+
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
+{
+public:
+    wxChoice();
+    
+    wxChoice( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (const wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
+    
+    wxChoice( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
+
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
+    
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
+
+    virtual wxSize DoGetBestSize() const;
+
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
+
+    virtual QComboBox *GetHandle() const;
+
+protected:
+    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData,
+                              wxClientDataType type);
+    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
+    
+    virtual void DoSetItemClientData(unsigned int n, void *clientData);
+    virtual void *DoGetItemClientData(unsigned int n) const;
+
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int pos);
+
+    QComboBox *m_qtComboBox;
+
+private:
+
+    DECLARE_DYNAMIC_CLASS(wxChoice)
+};
+
+#endif // _WX_QT_CHOICE_H_
diff --git a/include/wx/qt/clipbrd.h b/include/wx/qt/clipbrd.h
new file mode 100644
index 0000000000..9c8a50e00a
--- /dev/null
+++ b/include/wx/qt/clipbrd.h
@@ -0,0 +1,44 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/toolbar.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CLIPBRD_H_
+#define _WX_QT_CLIPBRD_H_
+
+#include "wx/weakref.h"
+
+class QtClipBoardSignalHandler;
+
+class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
+{
+public:
+    wxClipboard();
+    ~wxClipboard();
+
+    virtual bool Open();
+    virtual void Close();
+    virtual bool IsOpened() const;
+
+    virtual bool AddData( wxDataObject *data );
+    virtual bool SetData( wxDataObject *data );
+    virtual bool GetData( wxDataObject& data );
+    virtual void Clear();
+    virtual bool IsSupported( const wxDataFormat& format );
+    virtual bool IsSupportedAsync(wxEvtHandler *sink);
+
+private:
+    friend class QtClipBoardSignalHandler;
+    int Mode();
+
+    QtClipBoardSignalHandler *m_SignalHandler;
+    wxEvtHandlerRef    m_sink;
+
+    bool m_open;
+    
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
+};
+
+#endif // _WX_QT_CLIPBRD_H_
diff --git a/include/wx/qt/clrpicker.h b/include/wx/qt/clrpicker.h
new file mode 100644
index 0000000000..0ba5f0ea49
--- /dev/null
+++ b/include/wx/qt/clrpicker.h
@@ -0,0 +1,50 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/clrpicker.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CLRPICKER_H_
+#define _WX_QT_CLRPICKER_H_
+
+#include "wx/generic/clrpickerg.h"
+
+// TODO: A QtColorPicker is available from
+// http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Widgets/qtcolorpicker/
+// How to integrate into wxWidgets:
+//
+// class WXDLLIMPEXP_CORE wxColourPickerWidget : public wxButton, public wxColourPickerWidgetBase
+
+// TODO: For now we reuse the existing wxGenericColourButton but this should be
+// changed to use the above mentioned color picker.
+
+class WXDLLIMPEXP_CORE wxColourPickerWidget : public wxGenericColourButton
+{
+public:
+    wxColourPickerWidget();
+    wxColourPickerWidget(wxWindow *parent,
+                   wxWindowID id,
+                   const wxColour& initial = *wxBLACK,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxCLRBTN_DEFAULT_STYLE,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxColourPickerWidgetNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxColour& initial = *wxBLACK,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxCLRBTN_DEFAULT_STYLE,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxColourPickerWidgetNameStr);
+
+protected:
+    virtual void UpdateColour();
+
+private:
+};
+
+#endif // _WX_QT_CLRPICKER_H_
diff --git a/include/wx/qt/colordlg.h b/include/wx/qt/colordlg.h
new file mode 100644
index 0000000000..3e65349d40
--- /dev/null
+++ b/include/wx/qt/colordlg.h
@@ -0,0 +1,33 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/colordlg.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_COLORDLG_H_
+#define _WX_QT_COLORDLG_H_
+
+#include "wx/dialog.h"
+
+#include <QtWidgets/QColorDialog>
+
+class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
+{
+public:
+    wxColourDialog() { }
+    wxColourDialog(wxWindow *parent,
+                   wxColourData *data = NULL) { Create(parent, data); }
+
+    bool Create(wxWindow *parent, wxColourData *data = NULL);
+
+    wxColourData &GetColourData();
+
+    QColorDialog *GetHandle() const { return static_cast<QColorDialog *>(m_qtWindow); }
+
+private:
+
+    wxColourData m_data;
+};
+
+#endif // _WX_QT_COLORDLG_H_
diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h
new file mode 100644
index 0000000000..bcde5b716e
--- /dev/null
+++ b/include/wx/qt/colour.h
@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/colour.h
+// Purpose:     wxColour class implementation for wxQt
+// Author:      Peter Most, Kolya Kosenko
+// Created:     2010-05-12
+// Copyright:   (C) 2010 Kolya Kosenko
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_COLOUR_H_
+#define _WX_QT_COLOUR_H_
+
+#include <QtGui/QColor>
+
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
+{
+public:
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+    wxColour(const QColor& color) : m_qtColor(color) {}
+
+    virtual bool IsOk() const { return m_qtColor.isValid(); }
+
+    virtual ChannelType Red()   const { return m_qtColor.red();   }
+    virtual ChannelType Green() const { return m_qtColor.green(); }
+    virtual ChannelType Blue()  const { return m_qtColor.blue();  }
+    virtual ChannelType Alpha() const { return m_qtColor.alpha(); }
+
+    bool operator==(const wxColour& color) const
+        { return m_qtColor == color.m_qtColor; }
+    bool operator!=(const wxColour& color) const
+        { return m_qtColor != color.m_qtColor; }
+
+    int GetPixel() const;
+
+    QColor GetHandle() const { return m_qtColor; };
+
+protected:
+    virtual void
+    InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a)
+        { m_qtColor.setRgb(r, g, b, a); }
+
+private:
+    QColor m_qtColor;
+
+    DECLARE_DYNAMIC_CLASS(wxColour)
+};
+
+#endif // _WX_QT_COLOUR_H_
diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h
new file mode 100644
index 0000000000..87865d69d8
--- /dev/null
+++ b/include/wx/qt/combobox.h
@@ -0,0 +1,92 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/combobox.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_COMBOBOX_H_
+#define _WX_QT_COMBOBOX_H_
+
+#include "wx/choice.h"
+#include <QtWidgets/QComboBox>
+
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry
+{
+public:
+    wxComboBox();
+
+    wxComboBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr);
+
+    wxComboBox(wxWindow *parent, wxWindowID id,
+               const wxString& value,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = (const wxString *) NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
+
+    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
+    virtual void SetSelection(long from, long to);
+
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual void GetSelection(long *from, long *to) const;
+
+    virtual wxString GetStringSelection() const
+    {
+        return wxItemContainer::GetStringSelection();
+    }
+
+    virtual void Clear()
+    {
+        wxTextEntry::Clear();
+        wxItemContainer::Clear();
+    }
+
+    // See wxComboBoxBase discussion of IsEmpty().
+    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+
+    virtual void Popup();
+    virtual void Dismiss();
+
+protected:
+
+    // From wxTextEntry:
+    virtual wxString DoGetValue() const;
+
+private:
+
+    // From wxTextEntry:
+    virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
+
+    DECLARE_DYNAMIC_CLASS(wxComboBox)
+};
+
+#endif // _WX_QT_COMBOBOX_H_
diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h
new file mode 100644
index 0000000000..5e9b152431
--- /dev/null
+++ b/include/wx/qt/control.h
@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/control.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CONTROL_H_
+#define _WX_QT_CONTROL_H_
+
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase
+{
+public:
+    wxControl();
+    wxControl(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize, long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxControlNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);
+
+    virtual wxSize DoGetBestSize() const;
+
+protected:
+    bool QtCreateControl( wxWindow *parent, wxWindowID id, const wxPoint &pos,
+        const wxSize &size, long style, const wxValidator &validator,
+        const wxString &name );
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxControl)
+};
+
+#endif // _WX_QT_CONTROL_H_
diff --git a/include/wx/qt/ctrlsub.h b/include/wx/qt/ctrlsub.h
new file mode 100644
index 0000000000..2d4abfb30b
--- /dev/null
+++ b/include/wx/qt/ctrlsub.h
@@ -0,0 +1,22 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/ctrlsub.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CTRLSUB_H_
+#define _WX_QT_CTRLSUB_H_
+
+class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase
+{
+public:
+    wxControlWithItems();
+
+protected:
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
+};
+
+#endif // _WX_QT_CTRLSUB_H_
diff --git a/include/wx/qt/cursor.h b/include/wx/qt/cursor.h
new file mode 100644
index 0000000000..6c35738fe3
--- /dev/null
+++ b/include/wx/qt/cursor.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        cursor.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CURSOR_H_
+#define _WX_QT_CURSOR_H_
+
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/image.h"
+
+#include <QtGui/QCursor>
+
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
+{
+public:
+    wxCursor() { }
+    wxCursor( const wxCursor & );
+    wxCursor( const wxImage& image ) { InitFromImage(image); }
+    wxCursor( const wxString& name,
+              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+              int hotSpotX = 0, int hotSpotY = 0 );
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
+
+    QCursor m_qtCursor;
+
+protected:
+    void InitFromStock( wxStockCursor cursorId );
+#if wxUSE_IMAGE
+    void InitFromImage( const wxImage & image );
+#endif
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    
+    DECLARE_DYNAMIC_CLASS( wxCursor )
+};
+
+#endif // _WX_QT_CURSOR_H_
diff --git a/include/wx/qt/dataform.h b/include/wx/qt/dataform.h
new file mode 100644
index 0000000000..612903a881
--- /dev/null
+++ b/include/wx/qt/dataform.h
@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/toolbar.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DATAFORM_H_
+#define _WX_QT_DATAFORM_H_
+
+class WXDLLIMPEXP_CORE wxDataFormat
+{
+public:
+    wxDataFormat();
+    wxDataFormat( wxDataFormatId formatId );
+    wxDataFormat(const wxString &id);
+    wxDataFormat(const QString &id);
+    wxDataFormat(const wxChar *id);
+
+    void SetId( const wxChar *id );
+    
+    bool operator==(wxDataFormatId format) const;
+    bool operator!=(wxDataFormatId format) const;
+    bool operator==(const wxDataFormat& format) const;
+    bool operator!=(const wxDataFormat& format) const;
+
+    // string ids are used for custom types - this SetId() must be used for
+    // application-specific formats
+    wxString GetId() const;
+    void SetId( const wxString& id );
+
+    // implementation
+    wxDataFormatId GetType() const;
+    void SetType( wxDataFormatId type );
+
+    QString m_MimeType;
+};
+
+#endif // _WX_QT_DATAFORM_H_
diff --git a/include/wx/qt/dataobj.h b/include/wx/qt/dataobj.h
new file mode 100644
index 0000000000..8ccc1908e4
--- /dev/null
+++ b/include/wx/qt/dataobj.h
@@ -0,0 +1,30 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dataobj.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DATAOBJ_H_
+#define _WX_QT_DATAOBJ_H_
+
+#include <QMimeData>
+
+class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
+{
+public:
+    wxDataObject() {}
+    
+    virtual bool IsSupportedFormat(const wxDataFormat& format, Direction dir) const;
+    virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
+    virtual size_t GetFormatCount(Direction dir = Get) const;
+    virtual void GetAllFormats(wxDataFormat *formats, Direction dir = Get) const;
+    virtual size_t GetDataSize(const wxDataFormat& format) const;
+    virtual bool GetDataHere(const wxDataFormat& format, void *buf) const;
+    virtual bool SetData(const wxDataFormat& format, size_t len, const void * buf);
+
+private:
+    QMimeData m_qtMimeData; // to handle formats that have no helper classes
+};
+
+#endif // _WX_QT_DATAOBJ_H_
diff --git a/include/wx/qt/dataobj2.h b/include/wx/qt/dataobj2.h
new file mode 100644
index 0000000000..26536b2750
--- /dev/null
+++ b/include/wx/qt/dataobj2.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dataobj2.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DATAOBJ2_H_
+#define _WX_QT_DATAOBJ2_H_
+
+class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
+{
+public:
+    wxBitmapDataObject();
+    wxBitmapDataObject(const wxBitmap& bitmap);
+
+protected:
+
+private:
+};
+
+
+
+class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
+{
+public:
+    wxFileDataObject();
+
+    void AddFile( const wxString &filename );
+};
+
+#endif // _WX_QT_DATAOBJ2_H_
diff --git a/include/wx/qt/dataview.h b/include/wx/qt/dataview.h
new file mode 100644
index 0000000000..e53695fcfb
--- /dev/null
+++ b/include/wx/qt/dataview.h
@@ -0,0 +1,141 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dataview.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DATAVIEW_H_
+#define _WX_QT_DATAVIEW_H_
+
+class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
+{
+public:
+    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,
+                      wxAlignment align = wxALIGN_CENTER,
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer,
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,
+                      wxAlignment align = wxALIGN_CENTER,
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+
+
+    // setters:
+
+    virtual void SetTitle( const wxString &title );
+    virtual void SetBitmap( const wxBitmap &bitmap );
+
+    virtual void SetOwner( wxDataViewCtrl *owner );
+
+    virtual void SetAlignment( wxAlignment align );
+
+    virtual void SetSortable( bool sortable );
+    virtual void SetSortOrder( bool ascending );
+    virtual void SetAsSortKey(bool sort = true);
+
+    virtual void SetResizeable( bool resizeable );
+    virtual void SetHidden( bool hidden );
+
+    virtual void SetMinWidth( int minWidth );
+    virtual void SetWidth( int width );
+
+    virtual void SetReorderable( bool reorderable );
+
+    virtual void SetFlags(int flags);
+
+    // getters:
+
+    virtual wxString GetTitle() const;
+    virtual wxAlignment GetAlignment() const;
+
+    virtual bool IsSortable() const;
+    virtual bool IsSortOrderAscending() const;
+    virtual bool IsSortKey() const;
+
+    virtual bool IsResizeable() const;
+    virtual bool IsHidden() const;
+
+    virtual int GetWidth() const;
+    virtual int GetMinWidth() const;
+
+    virtual bool IsReorderable() const;
+
+    virtual int GetFlags() const;
+
+};
+
+
+class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase
+{
+public:
+    wxDataViewCtrl();
+
+    wxDataViewCtrl( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator );
+
+    virtual ~wxDataViewCtrl();
+
+
+    bool Create(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator );
+
+    virtual bool AssociateModel( wxDataViewModel *model );
+
+    virtual bool PrependColumn( wxDataViewColumn *col );
+    virtual bool AppendColumn( wxDataViewColumn *col );
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );
+
+    virtual unsigned int GetColumnCount() const;
+    virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
+    virtual bool DeleteColumn( wxDataViewColumn *column );
+    virtual bool ClearColumns();
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
+
+    virtual wxDataViewColumn *GetSortingColumn() const;
+
+    virtual wxDataViewItem GetSelection() const;
+    virtual int GetSelections( wxDataViewItemArray & sel ) const;
+    virtual void SetSelections( const wxDataViewItemArray & sel );
+    virtual void Select( const wxDataViewItem & item );
+    virtual void Unselect( const wxDataViewItem & item );
+    virtual bool IsSelected( const wxDataViewItem & item ) const;
+    virtual void SelectAll();
+    virtual void UnselectAll();
+
+    virtual void EnsureVisible( const wxDataViewItem& item,
+                                const wxDataViewColumn *column = NULL );
+    virtual void HitTest( const wxPoint &point,
+                          wxDataViewItem &item,
+                          wxDataViewColumn *&column ) const;
+    virtual wxRect GetItemRect( const wxDataViewItem &item,
+                                const wxDataViewColumn *column = NULL ) const;
+
+    virtual void Expand( const wxDataViewItem & item );
+    virtual void Collapse( const wxDataViewItem & item );
+    virtual bool IsExpanded( const wxDataViewItem & item ) const;
+
+    virtual bool EnableDragSource( const wxDataFormat &format );
+    virtual bool EnableDropTarget( const wxDataFormat &format );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    wxWindow *GetMainWindow() { return (wxWindow*) this; }
+
+    virtual void OnInternalIdle();
+
+protected:
+    virtual void DoSetExpanderColumn();
+    virtual void DoSetIndent();
+
+private:
+    virtual wxDataViewItem DoGetCurrentItem() const;
+    virtual void DoSetCurrentItem(const wxDataViewItem& item);
+};
+
+#endif // _WX_QT_DATAVIEW_H_
diff --git a/include/wx/qt/dc.h b/include/wx/qt/dc.h
new file mode 100644
index 0000000000..adb0fac3e2
--- /dev/null
+++ b/include/wx/qt/dc.h
@@ -0,0 +1,134 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dc.h
+// Author:      Peter Most, Javier Torres, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DC_H_
+#define _WX_QT_DC_H_
+
+#include <QtGui/QPainter>
+
+class QImage;
+
+class WXDLLIMPEXP_FWD_CORE wxRegion;
+
+class WXDLLIMPEXP_CORE wxQtDCImpl : public wxDCImpl
+{
+public:
+    wxQtDCImpl( wxDC *owner );
+    ~wxQtDCImpl();
+
+    virtual bool CanDrawBitmap() const;
+    virtual bool CanGetTextExtent() const;
+
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetSizeMM(int* width, int* height) const;
+
+    virtual int GetDepth() const;
+    virtual wxSize GetPPI() const;
+
+    virtual void SetFont(const wxFont& font);
+    virtual void SetPen(const wxPen& pen);
+    virtual void SetBrush(const wxBrush& brush);
+    virtual void SetBackground(const wxBrush& brush);
+    virtual void SetBackgroundMode(int mode);
+
+#if wxUSE_PALETTE
+    virtual void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
+
+    virtual void SetLogicalFunction(wxRasterOperationMode function);
+
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 const wxFont *theFont = NULL) const;
+
+    virtual void Clear();
+
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+                                     wxCoord width, wxCoord height);
+
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
+    virtual void DestroyClippingRegion();
+
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                             wxFloodFillStyle style = wxFLOOD_SURFACE);
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+
+    virtual void DoDrawPoint(wxCoord x, wxCoord y);
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+
+    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
+                           wxCoord x2, wxCoord y2,
+                           wxCoord xc, wxCoord yc);
+
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                   double sa, double ea);
+
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                        wxCoord width, wxCoord height,
+                                        double radius);
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y,
+                               wxCoord width, wxCoord height);
+
+    virtual void DoCrossHair(wxCoord x, wxCoord y);
+
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                              bool useMask = false);
+
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    virtual void DoDrawRotatedText(const wxString& text,
+                                   wxCoord x, wxCoord y, double angle);
+
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
+                        wxCoord width, wxCoord height,
+                        wxDC *source,
+                        wxCoord xsrc, wxCoord ysrc,
+                        wxRasterOperationMode rop = wxCOPY,
+                        bool useMask = false,
+                        wxCoord xsrcMask = wxDefaultCoord,
+                        wxCoord ysrcMask = wxDefaultCoord);
+
+    virtual void DoDrawLines(int n, const wxPoint points[],
+                             wxCoord xoffset, wxCoord yoffset );
+
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
+                           wxCoord xoffset, wxCoord yoffset,
+                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+
+    // Use Qt transformations, as they automatically scale pen widths, text...
+    virtual void ComputeScaleAndOrigin();
+
+    void QtPreparePainter();
+
+    virtual void* GetHandle() const { return (void*) m_qtPainter; }
+
+protected:
+    QPainter *m_qtPainter;
+    QImage *m_qtImage;
+
+    wxRegion *m_clippingRegion;
+private:
+    enum wxQtRasterColourOp
+    {
+        wxQtNONE,
+        wxQtWHITE,
+        wxQtBLACK,
+        wxQtINVERT
+    };
+    wxQtRasterColourOp m_rasterColourOp;
+    QColor m_qtPenColor;
+    QColor m_qtBrushColor;
+    void ApplyRasterColourOp();
+    
+};
+
+#endif // _WX_QT_DC_H_
diff --git a/include/wx/qt/dcclient.h b/include/wx/qt/dcclient.h
new file mode 100644
index 0000000000..bd37e4f21d
--- /dev/null
+++ b/include/wx/qt/dcclient.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dcclient.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DCCLIENT_H_
+#define _WX_QT_DCCLIENT_H_
+
+#include "wx/qt/dc.h"
+
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxQtDCImpl
+{
+public:
+    wxWindowDCImpl( wxDC *owner );
+    wxWindowDCImpl( wxDC *owner, wxWindow *win );
+
+    ~wxWindowDCImpl();
+
+protected:
+    wxWindow *m_window;
+
+private:
+
+};
+
+
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
+{
+public:
+    wxClientDCImpl( wxDC *owner );
+    wxClientDCImpl( wxDC *owner, wxWindow *win );
+
+    ~wxClientDCImpl();
+};
+
+
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxWindowDCImpl
+{
+public:
+    wxPaintDCImpl( wxDC *owner );
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );
+};
+
+#endif // _WX_QT_DCCLIENT_H_
diff --git a/include/wx/qt/dcmemory.h b/include/wx/qt/dcmemory.h
new file mode 100644
index 0000000000..b81ed82a07
--- /dev/null
+++ b/include/wx/qt/dcmemory.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dcmemory.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DCMEMORY_H_
+#define _WX_QT_DCMEMORY_H_
+
+#include "wx/qt/dcclient.h"
+
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxQtDCImpl
+{
+public:
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
+    ~wxMemoryDCImpl();
+
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
+
+protected:
+
+private:
+    wxBitmap m_selected;
+};
+
+#endif // _WX_QT_DCMEMORY_H_
diff --git a/include/wx/qt/dcprint.h b/include/wx/qt/dcprint.h
new file mode 100644
index 0000000000..3c567eef47
--- /dev/null
+++ b/include/wx/qt/dcprint.h
@@ -0,0 +1,106 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dcprint.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DCPRINT_H_
+#define _WX_QT_DCPRINT_H_
+
+#include "wx/dc.h"
+
+class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl
+{
+public:
+    wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
+    
+    virtual bool CanDrawBitmap() const;
+    virtual bool CanGetTextExtent() const;
+
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetSizeMM(int* width, int* height) const;
+
+    virtual int GetDepth() const;
+    virtual wxSize GetPPI() const;
+
+    virtual void SetFont(const wxFont& font);
+    virtual void SetPen(const wxPen& pen);
+    virtual void SetBrush(const wxBrush& brush);
+    virtual void SetBackground(const wxBrush& brush);
+    virtual void SetBackgroundMode(int mode);
+
+#if wxUSE_PALETTE
+    virtual void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
+
+    virtual void SetLogicalFunction(wxRasterOperationMode function);
+    
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 const wxFont *theFont = NULL) const;
+    
+    virtual void Clear();
+
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+                                     wxCoord width, wxCoord height);
+
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
+
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                             wxFloodFillStyle style = wxFLOOD_SURFACE);
+    
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+
+    virtual void DoDrawPoint(wxCoord x, wxCoord y);
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+
+    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
+                           wxCoord x2, wxCoord y2,
+                           wxCoord xc, wxCoord yc);
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                   double sa, double ea);
+
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                        wxCoord width, wxCoord height,
+                                        double radius);
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y,
+                               wxCoord width, wxCoord height);
+
+    virtual void DoCrossHair(wxCoord x, wxCoord y);
+
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                              bool useMask = false);
+
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    virtual void DoDrawRotatedText(const wxString& text,
+                                   wxCoord x, wxCoord y, double angle);
+
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
+                        wxCoord width, wxCoord height,
+                        wxDC *source,
+                        wxCoord xsrc, wxCoord ysrc,
+                        wxRasterOperationMode rop = wxCOPY,
+                        bool useMask = false,
+                        wxCoord xsrcMask = wxDefaultCoord,
+                        wxCoord ysrcMask = wxDefaultCoord);
+
+    virtual void DoDrawLines(int n, const wxPoint points[],
+                             wxCoord xoffset, wxCoord yoffset );
+
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
+                           wxCoord xoffset, wxCoord yoffset,
+                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+
+protected:
+
+private:
+};
+
+#endif // _WX_QT_DCPRINT_H_
diff --git a/include/wx/qt/dcscreen.h b/include/wx/qt/dcscreen.h
new file mode 100644
index 0000000000..8143f215a1
--- /dev/null
+++ b/include/wx/qt/dcscreen.h
@@ -0,0 +1,23 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dcscreen.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DCSCREEN_H_
+#define _WX_QT_DCSCREEN_H_
+
+#include "wx/qt/dcclient.h"
+
+class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl
+{
+public:
+    wxScreenDCImpl( wxScreenDC *owner );
+
+protected:
+
+private:
+};
+
+#endif // _WX_QT_DCSCREEN_H_
diff --git a/include/wx/qt/defs.h b/include/wx/qt/defs.h
new file mode 100644
index 0000000000..be9129c036
--- /dev/null
+++ b/include/wx/qt/defs.h
@@ -0,0 +1,17 @@
+/*
+ *  Name:        wx/qt/defs.h
+ *  Author:      Peter Most
+ *  Copyright:   (c) Peter Most
+ *  Licence:     wxWindows licence
+ */
+
+#ifndef _WX_QT_DEFS_H_
+#define _WX_QT_DEFS_H_
+
+#ifdef __cplusplus
+
+typedef class QWidget *WXWidget;
+
+#endif 
+
+#endif /* _WX_QT_DEFS_H_ */
diff --git a/include/wx/qt/dialog.h b/include/wx/qt/dialog.h
new file mode 100644
index 0000000000..cf33adfd74
--- /dev/null
+++ b/include/wx/qt/dialog.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dialog.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DIALOG_H_
+#define _WX_QT_DIALOG_H_
+
+#include "wx/dialog.h"
+#include <QtWidgets/QDialog>
+
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
+{
+public:
+    wxDialog();
+    wxDialog( wxWindow *parent, wxWindowID id,
+            const wxString &title,
+            const wxPoint &pos = wxDefaultPosition,
+            const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_DIALOG_STYLE,
+            const wxString &name = wxDialogNameStr );
+
+    virtual ~wxDialog();
+    
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxString &title,
+            const wxPoint &pos = wxDefaultPosition,
+            const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_DIALOG_STYLE,
+            const wxString &name = wxDialogNameStr );
+
+    virtual int ShowModal();
+    virtual void EndModal(int retCode);
+    virtual bool IsModal() const;
+
+    virtual QDialog *GetHandle() const;
+
+private:
+
+    wxDECLARE_DYNAMIC_CLASS( wxDialog );
+};
+
+
+#endif // _WX_QT_DIALOG_H_
diff --git a/include/wx/qt/dirdlg.h b/include/wx/qt/dirdlg.h
new file mode 100644
index 0000000000..7a32531693
--- /dev/null
+++ b/include/wx/qt/dirdlg.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dirdlg.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) 2014 Sean D'Epagnier
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DIRDLG_H_
+#define _WX_QT_DIRDLG_H_
+
+#include <QtWidgets/QFileDialog>
+
+class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
+{
+public:
+    wxDirDialog() { }
+
+    wxDirDialog(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);
+
+    bool Create(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);
+
+public:     // overrides from wxGenericDirDialog
+
+    wxString GetPath() const wxOVERRIDE;
+    void SetPath(const wxString& path) wxOVERRIDE;
+
+    virtual QFileDialog *GetHandle() const;
+
+private:
+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+};
+
+#endif // _WX_QT_DIRDLG_H_
diff --git a/include/wx/qt/dnd.h b/include/wx/qt/dnd.h
new file mode 100644
index 0000000000..d06a35a570
--- /dev/null
+++ b/include/wx/qt/dnd.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dnd.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DND_H_
+#define _WX_QT_DND_H_
+
+#define wxDROP_ICON(name)   wxICON(name)
+
+class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
+{
+public:
+    wxDropTarget(wxDataObject *dataObject = NULL );
+    
+    virtual bool OnDrop(wxCoord x, wxCoord y);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+    virtual bool GetData();
+
+    wxDataFormat GetMatchingPair();
+
+protected:
+
+private:
+};
+
+
+class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase
+{
+public:
+    wxDropSource( wxWindow *win = NULL,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
+
+    wxDropSource( wxDataObject& data,
+                  wxWindow *win,
+                  const wxIcon &copy = wxNullIcon,
+                  const wxIcon &move = wxNullIcon,
+                  const wxIcon &none = wxNullIcon);
+    
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
+};
+#endif // _WX_QT_DND_H_
diff --git a/include/wx/qt/dvrenderer.h b/include/wx/qt/dvrenderer.h
new file mode 100644
index 0000000000..b1841fe784
--- /dev/null
+++ b/include/wx/qt/dvrenderer.h
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dvrenderer.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DVRENDERER_H_
+#define _WX_QT_DVRENDERER_H_
+
+// ----------------------------------------------------------------------------
+// wxDataViewRenderer
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
+{
+public:
+    wxDataViewRenderer( const wxString &varianttype,
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                        int align = wxDVR_DEFAULT_ALIGNMENT );
+
+    virtual void SetMode( wxDataViewCellMode mode );
+    virtual wxDataViewCellMode GetMode() const;
+
+    virtual void SetAlignment( int align );
+    virtual int GetAlignment() const;
+
+    virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
+    virtual wxEllipsizeMode GetEllipsizeMode() const;
+};
+
+#endif // _WX_QT_DVRENDERER_H_
diff --git a/include/wx/qt/dvrenderers.h b/include/wx/qt/dvrenderers.h
new file mode 100644
index 0000000000..75a19a87b0
--- /dev/null
+++ b/include/wx/qt/dvrenderers.h
@@ -0,0 +1,176 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dvrenderers.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DVRENDERERS_H_
+#define _WX_QT_DVRENDERERS_H_
+
+// ---------------------------------------------------------
+// wxDataViewTextRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                            int align = wxDVR_DEFAULT_ALIGNMENT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+
+    void SetAlignment( int align );
+};
+
+// ---------------------------------------------------------
+// wxDataViewBitmapRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                              int align = wxDVR_DEFAULT_ALIGNMENT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+};
+
+// ---------------------------------------------------------
+// wxDataViewToggleRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                              int align = wxDVR_DEFAULT_ALIGNMENT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+};
+
+// ---------------------------------------------------------
+// wxDataViewCustomRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                              int align = wxDVR_DEFAULT_ALIGNMENT,
+                              bool no_init = false );
+    virtual ~wxDataViewCustomRenderer();
+
+
+    virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
+
+    void RenderText( const wxString &text, int xoffset,  wxRect cell, wxDC *dc, int state );
+
+    virtual wxSize GetSize() const = 0;
+
+    virtual bool Activate( wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
+                           { return false; }
+
+    virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
+                           { return false; }
+    virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
+                           { return false; }
+
+    // Create DC on request
+    virtual wxDC *GetDC();
+};
+
+// ---------------------------------------------------------
+// wxDataViewProgressRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
+                                const wxString &varianttype = wxT("long"),
+                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                                int align = wxDVR_DEFAULT_ALIGNMENT );
+    virtual ~wxDataViewProgressRenderer();
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+
+    virtual bool Render( wxRect cell, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+};
+
+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"),
+                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                                int align = wxDVR_DEFAULT_ALIGNMENT );
+    virtual ~wxDataViewIconTextRenderer();
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+
+    virtual bool Render( wxRect cell, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+
+    virtual bool HasEditorCtrl() const { return true; }
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+};
+
+// ---------------------------------------------------------
+// wxDataViewDateRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"),
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
+                            int align = wxDVR_DEFAULT_ALIGNMENT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+
+    virtual bool Render( wxRect cell, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+    virtual bool Activate( wxRect cell,
+                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col );
+
+};
+
+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewChoiceRenderer( const wxArrayString &choices,
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
+                            int alignment = wxDVR_DEFAULT_ALIGNMENT );
+    virtual bool Render( wxRect rect, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+    virtual bool SetValue( const wxVariant &value );
+    virtual bool GetValue( wxVariant &value ) const;
+
+    void SetAlignment( int align );
+};
+
+#endif // _WX_QT_DVRENDERERS_H_
+
diff --git a/include/wx/qt/evtloop.h b/include/wx/qt/evtloop.h
new file mode 100644
index 0000000000..bb3b90fbe9
--- /dev/null
+++ b/include/wx/qt/evtloop.h
@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/evtloop.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_EVTLOOP_H_
+#define _WX_QT_EVTLOOP_H_
+
+#include <QtCore/QTimer>
+
+class WXDLLIMPEXP_BASE wxQtEventLoopBase : public wxEventLoopBase
+{
+public:
+    wxQtEventLoopBase();
+    ~wxQtEventLoopBase();
+
+    virtual int DoRun();
+    virtual void ScheduleExit(int rc = 0);
+    virtual bool Pending() const;
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+    virtual void DoYieldFor(long eventsToProcess);
+
+#if wxUSE_EVENTLOOP_SOURCE
+    virtual wxEventLoopSource *AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
+#endif // wxUSE_EVENTLOOP_SOURCE
+protected:
+
+private:
+    QTimer *m_qtIdleTimer;
+    
+    wxDECLARE_NO_COPY_CLASS(wxQtEventLoopBase);
+};
+
+
+#if wxUSE_GUI
+
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxQtEventLoopBase
+{
+public:
+    wxGUIEventLoop();
+};
+
+#else // !wxUSE_GUI
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxQtEventLoopBase
+{
+public:
+    wxConsoleEventLoop();
+};
+
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif // wxUSE_GUI
+
+
+class wxQtEventLoopBase;
+
+class wxQtIdleTimer : public QTimer
+{
+
+public:
+    wxQtIdleTimer( wxQtEventLoopBase *eventLoop );
+    virtual bool eventFilter( QObject * watched, QEvent * event  );
+
+private:
+    void idle();
+
+private:
+    wxQtEventLoopBase *m_eventLoop;
+};
+
+#endif // _WX_QT_EVTLOOP_H_
diff --git a/include/wx/qt/filedlg.h b/include/wx/qt/filedlg.h
new file mode 100644
index 0000000000..7983d12514
--- /dev/null
+++ b/include/wx/qt/filedlg.h
@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/filedlg.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) 2014 Sean D'Epagnier
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_FILEDLG_H_
+#define _WX_QT_FILEDLG_H_
+
+#include <QtWidgets/QFileDialog>
+
+class WXDLLIMPEXP_CORE wxFileDialog : public wxFileDialogBase
+{
+public:
+    wxFileDialog() { }
+    wxFileDialog(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr);
+    bool Create(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr);
+
+    virtual wxString GetPath() const wxOVERRIDE;
+    virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE;
+    virtual wxString GetFilename() const wxOVERRIDE;
+    virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE;
+    virtual int GetFilterIndex() const wxOVERRIDE;
+
+    virtual void SetMessage(const wxString& message) wxOVERRIDE;
+    virtual void SetPath(const wxString& path) wxOVERRIDE;
+    virtual void SetDirectory(const wxString& dir) wxOVERRIDE;
+    virtual void SetFilename(const wxString& name) wxOVERRIDE;
+    virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE;
+    virtual void SetFilterIndex(int filterIndex) wxOVERRIDE;
+
+    virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
+
+    virtual QFileDialog *GetHandle() const;
+    
+private:
+    
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+};
+
+#endif // _WX_QT_FILEDLG_H_
diff --git a/include/wx/qt/font.h b/include/wx/qt/font.h
new file mode 100644
index 0000000000..f47fe772d5
--- /dev/null
+++ b/include/wx/qt/font.h
@@ -0,0 +1,82 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/font.h
+// Author:      Peter Most, Javier Torres, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_FONT_H_
+#define _WX_QT_FONT_H_
+
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
+{
+public:
+    wxFont();
+    wxFont(const wxFontInfo& info);
+    wxFont(const wxString& nativeFontInfoString);
+    wxFont(const wxNativeFontInfo& info);
+    wxFont(const QFont& font);
+    wxFont(int size,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+    wxFont(const wxSize& pixelSize,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    wxFont(int size,
+           int family,
+           int style,
+           int weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    bool Create(wxSize size,
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    // accessors: get the font characteristics
+    virtual int GetPointSize() const;
+    virtual wxFontStyle GetStyle() const;
+    virtual wxFontWeight GetWeight() const;
+    virtual bool GetUnderlined() const;
+    virtual wxString GetFaceName() const;
+    virtual wxFontEncoding GetEncoding() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+
+    // change the font characteristics
+    virtual void SetPointSize( int pointSize );
+    virtual void SetFamily( wxFontFamily family );
+    virtual void SetStyle( wxFontStyle style );
+    virtual bool SetFaceName(const wxString& facename);
+    virtual void SetWeight( wxFontWeight weight );
+    virtual void SetUnderlined( bool underlined );
+    virtual void SetEncoding(wxFontEncoding encoding);
+    
+    wxDECLARE_COMMON_FONT_METHODS();
+
+    virtual QFont GetHandle() const;
+    
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxFontFamily DoGetFamily() const;
+
+    DECLARE_DYNAMIC_CLASS( wxFont )
+
+};
+
+
+#endif // _WX_QT_FONT_H_
diff --git a/include/wx/qt/fontdlg.h b/include/wx/qt/fontdlg.h
new file mode 100644
index 0000000000..de44da7473
--- /dev/null
+++ b/include/wx/qt/fontdlg.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/fontdlg.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_FONTDLG_H_
+#define _WX_QT_FONTDLG_H_
+
+#include <QtWidgets/QFontDialog>
+
+class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase
+{
+public:
+    wxFontDialog() { }
+    wxFontDialog(wxWindow *parent) { Create(parent); }
+    wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
+    
+    virtual QFontDialog *GetHandle() const { return static_cast<QFontDialog *>(m_qtWindow); }
+
+protected:
+    bool DoCreate(wxWindow *parent);
+    
+private:
+
+    wxFontData m_data;
+
+    DECLARE_DYNAMIC_CLASS(wxFontDialog)
+};
+
+#endif // _WX_QT_FONTDLG_H_
diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h
new file mode 100644
index 0000000000..15f2a3f162
--- /dev/null
+++ b/include/wx/qt/frame.h
@@ -0,0 +1,61 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/frame.h
+// Purpose:     wxFrame class interface
+// Author:      Peter Most
+// Modified by:
+// Created:     09.08.09
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_FRAME_H_
+#define _WX_QT_FRAME_H_
+
+#include "wx/frame.h"
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QScrollArea>
+
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
+{
+public:
+    wxFrame();
+    wxFrame(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr);
+    virtual ~wxFrame();
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+
+    virtual void SetMenuBar(wxMenuBar *menubar);
+    virtual void SetStatusBar(wxStatusBar *statusBar );
+    virtual void SetToolBar(wxToolBar *toolbar);
+    
+    virtual void SetWindowStyleFlag( long style );
+
+    virtual void AddChild( wxWindowBase *child );
+    virtual void RemoveChild( wxWindowBase *child );
+
+    virtual QMainWindow *GetHandle() const
+    {
+        return static_cast<QMainWindow*>(m_qtWindow);
+    }
+
+    virtual QAbstractScrollArea *QtGetScrollBarsContainer() const;
+
+private:
+
+    wxDECLARE_DYNAMIC_CLASS( wxFrame );
+};
+
+
+#endif // _WX_QT_FRAME_H_
diff --git a/include/wx/qt/gauge.h b/include/wx/qt/gauge.h
new file mode 100644
index 0000000000..f987a40d4b
--- /dev/null
+++ b/include/wx/qt/gauge.h
@@ -0,0 +1,51 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/gauge.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_GAUGE_H_
+#define _WX_QT_GAUGE_H_
+
+#include <QtWidgets/QProgressBar>
+
+class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
+{
+public:
+    wxGauge();
+
+    wxGauge(wxWindow *parent,
+            wxWindowID id,
+            int range,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxGA_HORIZONTAL,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxGaugeNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                int range,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxGA_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxGaugeNameStr);
+
+    virtual QProgressBar *GetHandle() const;
+
+    // set/get the control range
+    virtual void SetRange(int range);
+    virtual int GetRange() const;
+
+    virtual void SetValue(int pos);
+    virtual int GetValue() const;
+
+private:
+    QProgressBar *m_qtProgressBar;
+
+    wxDECLARE_DYNAMIC_CLASS(wxGauge);
+};
+
+#endif // _WX_QT_GAUGE_H_
diff --git a/include/wx/qt/glcanvas.h b/include/wx/qt/glcanvas.h
new file mode 100644
index 0000000000..f812ffaf6c
--- /dev/null
+++ b/include/wx/qt/glcanvas.h
@@ -0,0 +1,65 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/qt/glcanvas.cpp
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
+#include <QtOpenGL/QGLWidget>
+
+class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase
+{
+public:
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
+///    virtual ~wxGLContext();
+
+    virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE;
+
+private:
+    QGLContext *m_glContext;
+
+    DECLARE_CLASS(wxGLContext)
+};
+
+// ----------------------------------------------------------------------------
+// wxGLCanvas: OpenGL output window
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
+{
+public:
+    wxEXPLICIT // avoid implicitly converting a wxWindow* to wxGLCanvas
+    wxGLCanvas(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const int *attribList = NULL,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxString& name = wxGLCanvasName,
+               const wxPalette& palette = wxNullPalette);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxGLCanvasName,
+                const int *attribList = NULL,
+                const wxPalette& palette = wxNullPalette);
+
+    virtual bool SwapBuffers();
+
+    static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format);
+
+    virtual QGLWidget *GetHandle() const { return static_cast<QGLWidget *>(m_qtWindow); }
+
+private:
+
+//    DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(wxGLCanvas)
+};
+
+#endif // _WX_GLCANVAS_H_
diff --git a/include/wx/qt/listbox.h b/include/wx/qt/listbox.h
new file mode 100644
index 0000000000..faf710b569
--- /dev/null
+++ b/include/wx/qt/listbox.h
@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/listbox.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_LISTBOX_H_
+#define _WX_QT_LISTBOX_H_
+
+#include <QtWidgets/QListWidget>
+
+class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
+{
+public:
+    wxListBox();
+    wxListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+
+    wxListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+
+    virtual ~wxListBox();
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+
+    virtual bool IsSelected(int n) const;
+    virtual int GetSelections(wxArrayInt& aSelections) const;
+    
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+    
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
+
+    virtual QListWidget *GetHandle() const;
+
+    void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected);
+
+protected:
+    virtual void DoSetFirstItem(int n);
+
+    virtual void DoSetSelection(int n, bool select);
+    
+    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData,
+                              wxClientDataType type);
+    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
+    
+    virtual void DoSetItemClientData(unsigned int n, void *clientData);
+    virtual void *DoGetItemClientData(unsigned int n) const;
+    
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int pos);
+
+    virtual QScrollArea *QtGetScrollBarsContainer() const;
+
+#if wxUSE_CHECKLISTBOX
+    bool       m_hasCheckBoxes;
+#endif // wxUSE_CHECKLISTBOX
+
+    QListWidget *m_qtListWidget;
+
+private:
+    virtual void Init(); //common construction
+
+    DECLARE_DYNAMIC_CLASS(wxListBox)
+};
+
+#endif // _WX_QT_LISTBOX_H_
diff --git a/include/wx/qt/listctrl.h b/include/wx/qt/listctrl.h
new file mode 100644
index 0000000000..bd85a9562e
--- /dev/null
+++ b/include/wx/qt/listctrl.h
@@ -0,0 +1,322 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/listctrl.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_LISTCTRL_H_
+#define _WX_QT_LISTCTRL_H_
+
+#include "wx/textctrl.h"
+#include <QtWidgets/QTreeWidget>
+
+class WXDLLIMPEXP_FWD_CORE wxImageList;
+
+class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
+{
+public:
+    wxListCtrl();
+
+    wxListCtrl(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxLC_ICON,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxListCtrlNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLC_ICON,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListCtrlNameStr);
+
+    virtual ~wxListCtrl();
+
+    // Attributes
+    ////////////////////////////////////////////////////////////////////////////
+
+    // Set the control colours
+    bool SetForegroundColour(const wxColour& col);
+    bool SetBackgroundColour(const wxColour& col);
+
+    // Gets information about this column
+    bool GetColumn(int col, wxListItem& info) const;
+
+    // Sets information about this column
+    bool SetColumn(int col, const wxListItem& info);
+
+    // Gets the column width
+    int GetColumnWidth(int col) const;
+
+    // Sets the column width
+    bool SetColumnWidth(int col, int width);
+
+
+    // Gets the column order from its index or index from its order
+    int GetColumnOrder(int col) const;
+    int GetColumnIndexFromOrder(int order) const;
+
+    // Gets the column order for all columns
+    wxArrayInt GetColumnsOrder() const;
+
+    // Sets the column order for all columns
+    bool SetColumnsOrder(const wxArrayInt& orders);
+
+
+    // Gets the number of items that can fit vertically in the
+    // visible area of the list control (list or report view)
+    // or the total number of items in the list control (icon
+    // or small icon view)
+    int GetCountPerPage() const;
+
+    // return the total area occupied by all the items (icon/small icon only)
+    wxRect GetViewRect() const;
+
+    // Gets the edit control for editing labels.
+    wxTextCtrl* GetEditControl() const;
+
+    // Gets information about the item
+    bool GetItem(wxListItem& info) const;
+
+    // Sets information about the item
+    bool SetItem(wxListItem& info);
+
+    // Sets a string field at a particular column
+    long SetItem(long index, int col, const wxString& label, int imageId = -1);
+
+    // Gets the item state
+    int  GetItemState(long item, long stateMask) const;
+
+    // Sets the item state
+    bool SetItemState(long item, long state, long stateMask);
+
+    // Sets the item image
+    bool SetItemImage(long item, int image, int selImage = -1);
+    bool SetItemColumnImage(long item, long column, int image);
+
+    // Gets the item text
+    wxString GetItemText(long item, int col = 0) const;
+
+    // Sets the item text
+    void SetItemText(long item, const wxString& str);
+
+    // Gets the item data
+    wxUIntPtr GetItemData(long item) const;
+
+    // Sets the item data
+    bool SetItemPtrData(long item, wxUIntPtr data);
+    bool SetItemData(long item, long data);
+
+    // Gets the item rectangle
+    bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const;
+
+    // Gets the subitem rectangle in report mode
+    bool GetSubItemRect(long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const;
+
+    // Gets the item position
+    bool GetItemPosition(long item, wxPoint& pos) const;
+
+    // Sets the item position
+    bool SetItemPosition(long item, const wxPoint& pos);
+
+    // Gets the number of items in the list control
+    int GetItemCount() const;
+
+    // Gets the number of columns in the list control
+    int GetColumnCount() const;
+
+    // get the horizontal and vertical components of the item spacing
+    wxSize GetItemSpacing() const;
+
+    // Foreground colour of an item.
+    void SetItemTextColour( long item, const wxColour& col);
+    wxColour GetItemTextColour( long item ) const;
+
+    // Background colour of an item.
+    void SetItemBackgroundColour( long item, const wxColour &col);
+    wxColour GetItemBackgroundColour( long item ) const;
+
+    // Font of an item.
+    void SetItemFont( long item, const wxFont &f);
+    wxFont GetItemFont( long item ) const;
+
+    // Gets the number of selected items in the list control
+    int GetSelectedItemCount() const;
+
+    // Gets the text colour of the listview
+    wxColour GetTextColour() const;
+
+    // Sets the text colour of the listview
+    void SetTextColour(const wxColour& col);
+
+    // Gets the index of the topmost visible item when in
+    // list or report view
+    long GetTopItem() const;
+
+    // Add or remove a single window style
+    void SetSingleStyle(long style, bool add = true);
+
+    // Set the whole window style
+    void SetWindowStyleFlag(long style);
+
+    // Searches for an item, starting from 'item'.
+    // item can be -1 to find the first item that matches the
+    // specified flags.
+    // Returns the item or -1 if unsuccessful.
+    long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const;
+
+    // Gets one of the three image lists
+    wxImageList *GetImageList(int which) const;
+
+    // Sets the image list
+    // N.B. There's a quirk in the Win95 list view implementation.
+    // If in wxLC_LIST mode, it'll *still* display images by the labels if
+    // there's a small-icon image list set for the control - even though you
+    // haven't specified wxLIST_MASK_IMAGE when inserting.
+    // So you have to set a NULL small-icon image list to be sure that
+    // the wxLC_LIST mode works without icons. Of course, you may want icons...
+    void SetImageList(wxImageList *imageList, int which);
+    void AssignImageList(wxImageList *imageList, int which);
+
+    // are we in report mode?
+    bool InReportView() const;
+
+    // are we in virtual report mode?
+    bool IsVirtual() const;
+
+    // refresh items selectively (only useful for virtual list controls)
+    void RefreshItem(long item);
+    void RefreshItems(long itemFrom, long itemTo);
+
+    // Operations
+    ////////////////////////////////////////////////////////////////////////////
+
+    // Arranges the items
+    bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
+
+    // Deletes an item
+    bool DeleteItem(long item);
+
+    // Deletes all items
+    bool DeleteAllItems();
+
+    // Deletes a column
+    bool DeleteColumn(int col);
+
+    // Deletes all columns
+    bool DeleteAllColumns();
+
+    // Clears items, and columns if there are any.
+    void ClearAll();
+
+    // Edit the label
+    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+
+    // End label editing, optionally cancelling the edit
+    bool EndEditLabel(bool cancel);
+
+    // Ensures this item is visible
+    bool EnsureVisible(long item);
+
+    // Find an item whose label matches this string, starting from the item after 'start'
+    // or the beginning if 'start' is -1.
+    long FindItem(long start, const wxString& str, bool partial = false);
+
+    // Find an item whose data matches this data, starting from the item after 'start'
+    // or the beginning if 'start' is -1.
+    long FindItem(long start, wxUIntPtr data);
+
+    // Find an item nearest this position in the specified direction, starting from
+    // the item after 'start' or the beginning if 'start' is -1.
+    long FindItem(long start, const wxPoint& pt, int direction);
+
+    // Determines which item (if any) is at the specified point,
+    // giving details in 'flags' (see wxLIST_HITTEST_... flags above)
+    // Request the subitem number as well at the given coordinate.
+    long HitTest(const wxPoint& point, int& flags, long* ptrSubItem = NULL) const;
+
+    // Inserts an item, returning the index of the new item if successful,
+    // -1 otherwise.
+    long InsertItem(const wxListItem& info);
+
+    // Insert a string item
+    long InsertItem(long index, const wxString& label);
+
+    // Insert an image item
+    long InsertItem(long index, int imageIndex);
+
+    // Insert an image/string item
+    long InsertItem(long index, const wxString& label, int imageIndex);
+
+    // set the number of items in a virtual list control
+    void SetItemCount(long count);
+
+    // Scrolls the list control. If in icon, small icon or report view mode,
+    // x specifies the number of pixels to scroll. If in list view mode, x
+    // specifies the number of columns to scroll.
+    // If in icon, small icon or list view mode, y specifies the number of pixels
+    // to scroll. If in report view mode, y specifies the number of lines to scroll.
+    bool ScrollList(int dx, int dy);
+
+    // Sort items.
+
+    // fn is a function which takes 3 long arguments: item1, item2, data.
+    // item1 is the long data associated with a first item (NOT the index).
+    // item2 is the long data associated with a second item (NOT the index).
+    // data is the same value as passed to SortItems.
+    // The return value is a negative number if the first item should precede the second
+    // item, a positive number of the second item should precede the first,
+    // or zero if the two items are equivalent.
+
+    // data is arbitrary data to be passed to the sort function.
+    bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
+
+
+    // these functions are only used for virtual list view controls, i.e. the
+    // ones with wxLC_VIRTUAL style (not currently implemented in wxQT)
+
+    // return the text for the given column of the given item
+    virtual wxString OnGetItemText(long item, long column) const;
+
+    // return the icon for the given item. In report view, OnGetItemImage will
+    // only be called for the first column. See OnGetItemColumnImage for
+    // details.
+    virtual int OnGetItemImage(long item) const;
+
+    // return the icon for the given item and column.
+    virtual int OnGetItemColumnImage(long item, long column) const;
+
+    // return the attribute for the given item and column (may return NULL if none)
+    virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
+    {
+        return OnGetItemAttr(item);
+    }
+
+    virtual QTreeWidget *GetHandle() const;
+
+protected:
+    void Init();
+
+    // Implement base class pure virtual methods.
+    long DoInsertColumn(long col, const wxListItem& info);
+
+    QTreeWidgetItem *QtGetItem(int id) const;
+
+    wxImageList *     m_imageListNormal; // The image list for normal icons
+    wxImageList *     m_imageListSmall;  // The image list for small icons
+    wxImageList *     m_imageListState;  // The image list state icons (not implemented yet)
+    bool              m_ownsImageListNormal,
+                      m_ownsImageListSmall,
+                      m_ownsImageListState;
+private:
+    QTreeWidget *m_qtTreeWidget;
+
+    wxDECLARE_DYNAMIC_CLASS( wxListCtrl );
+};
+
+#endif
+
diff --git a/include/wx/qt/mdi.h b/include/wx/qt/mdi.h
new file mode 100644
index 0000000000..d0a765ee06
--- /dev/null
+++ b/include/wx/qt/mdi.h
@@ -0,0 +1,80 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/mdi.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_MDI_H_
+#define _WX_QT_MDI_H_
+
+class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
+{
+public:
+    wxMDIParentFrame();
+    wxMDIParentFrame(wxWindow *parent,
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                     const wxString& name = wxFrameNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                const wxString& name = wxFrameNameStr);
+
+    // override/implement base class [pure] virtual methods
+    // ----------------------------------------------------
+
+    static bool IsTDI() { return false; }
+
+    virtual void ActivateNext();
+    virtual void ActivatePrevious();
+
+protected:
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+};
+
+
+
+class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase
+{
+public:
+    wxMDIChildFrame();
+    wxMDIChildFrame(wxMDIParentFrame *parent,
+                    wxWindowID id,
+                    const wxString& title,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxDEFAULT_FRAME_STYLE,
+                    const wxString& name = wxFrameNameStr);
+
+    bool Create(wxMDIParentFrame *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+
+    virtual void Activate();
+};
+
+
+
+class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
+{
+public:
+    wxMDIClientWindow();
+    
+    virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
+};
+
+#endif // _WX_QT_MDI_H_
diff --git a/include/wx/qt/menu.h b/include/wx/qt/menu.h
new file mode 100644
index 0000000000..0d2df84de0
--- /dev/null
+++ b/include/wx/qt/menu.h
@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/menu.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_MENU_H_
+#define _WX_QT_MENU_H_
+
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
+{
+public:
+    wxMenu(long style = 0);
+    wxMenu(const wxString& title, long style = 0);
+
+    virtual QMenu *GetHandle() const;
+
+protected:
+    virtual wxMenuItem *DoAppend(wxMenuItem *item);
+    virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+
+private:
+    QMenu *m_qtMenu;
+
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
+};
+
+
+
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
+{
+public:
+    wxMenuBar();
+    wxMenuBar(long style);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+
+    virtual bool Append(wxMenu *menu, const wxString& title);
+    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
+    virtual wxMenu *Remove(size_t pos);
+
+    virtual void EnableTop(size_t pos, bool enable);
+
+    virtual void SetMenuLabel(size_t pos, const wxString& label);
+    virtual wxString GetMenuLabel(size_t pos) const;
+
+    virtual QMenuBar *GetHandle() const;
+
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();
+
+private:
+    QMenuBar *m_qtMenuBar;
+
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
+};
+
+#endif // _WX_QT_MENU_H_
diff --git a/include/wx/qt/menuitem.h b/include/wx/qt/menuitem.h
new file mode 100644
index 0000000000..1daa8339b2
--- /dev/null
+++ b/include/wx/qt/menuitem.h
@@ -0,0 +1,50 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/menuitem.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_MENUITEM_H_
+#define _WX_QT_MENUITEM_H_
+
+#include "wx/menuitem.h"
+#include <QtWidgets/QAction>
+
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
+
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
+{
+public:
+    wxMenuItem(wxMenu *parentMenu = NULL,
+               int id = wxID_SEPARATOR,
+               const wxString& text = wxEmptyString,
+               const wxString& help = wxEmptyString,
+               wxItemKind kind = wxITEM_NORMAL,
+               wxMenu *subMenu = NULL);
+
+    virtual void SetItemLabel(const wxString& str);
+    virtual void SetCheckable(bool checkable);
+
+    virtual void Enable(bool enable = true);
+    virtual bool IsEnabled() const;
+
+    virtual void Check(bool check = true);
+    virtual bool IsChecked() const;
+
+    void SetBitmap(const wxBitmap& bitmap);
+    const wxBitmap& GetBitmap() const;
+
+    virtual QAction *GetHandle() const;
+
+private:
+    // Qt is using an action instead of a menu item.
+    QAction *m_qtAction;
+
+    wxDECLARE_DYNAMIC_CLASS( wxMenuItem );
+};
+
+
+
+#endif // _WX_QT_MENUITEM_H_
diff --git a/include/wx/qt/minifram.h b/include/wx/qt/minifram.h
new file mode 100644
index 0000000000..86897e2730
--- /dev/null
+++ b/include/wx/qt/minifram.h
@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/minifram.h
+// Purpose:     wxMiniFrame class
+// Author:      Mariano Reingart
+// Copyright:   (c) 2014 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MINIFRAM_H_
+#define _WX_MINIFRAM_H_
+
+#include "wx/frame.h"
+
+class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame
+{
+public:
+  wxMiniFrame() { }
+
+  bool Create(wxWindow *parent,
+              wxWindowID id,
+              const wxString& title,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
+              const wxString& name = wxFrameNameStr)
+  {
+      return wxFrame::Create(parent, id, title, pos, size,
+                             style | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR, 
+                             name);
+  }
+
+  wxMiniFrame(wxWindow *parent,
+              wxWindowID id,
+              const wxString& title,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
+              const wxString& name = wxFrameNameStr)
+  {
+      Create(parent, id, title, pos, size, style, name);
+  }
+
+protected:
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)
+};
+
+#endif
+    // _WX_MINIFRAM_H_
diff --git a/include/wx/qt/msgdlg.h b/include/wx/qt/msgdlg.h
new file mode 100644
index 0000000000..fb57e2088e
--- /dev/null
+++ b/include/wx/qt/msgdlg.h
@@ -0,0 +1,33 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/msgdlg.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_MSGDLG_H_
+#define _WX_QT_MSGDLG_H_
+
+#include "wx/msgdlg.h"
+
+#include <QtWidgets/QMessageBox>
+
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
+{
+public:
+    wxMessageDialog(wxWindow *parent, const wxString& message,
+                    const wxString& caption = wxMessageBoxCaptionStr,
+                    long style = wxOK|wxCENTRE,
+                    const wxPoint& pos = wxDefaultPosition);
+    virtual ~wxMessageDialog();
+
+    // Reimplemented to translate return codes from Qt to wx
+    virtual int ShowModal();
+    
+    virtual QMessageBox *GetHandle() const;
+
+private:
+    QMessageBox *m_qtMessageBox;
+};
+
+#endif // _WX_QT_MSGDLG_H_
diff --git a/include/wx/qt/notebook.h b/include/wx/qt/notebook.h
new file mode 100644
index 0000000000..c62fb4e859
--- /dev/null
+++ b/include/wx/qt/notebook.h
@@ -0,0 +1,64 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/notebook.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_NOTEBOOK_H_
+#define _WX_QT_NOTEBOOK_H_
+
+#include <QtWidgets/QTabWidget>
+
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
+{
+public:
+    wxNotebook();
+    wxNotebook(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+             const wxString& name = wxNotebookNameStr);
+    
+    bool Create(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = 0,
+              const wxString& name = wxNotebookNameStr);
+
+    virtual void SetPadding(const wxSize& padding);
+    virtual void SetTabSize(const wxSize& sz);
+
+    virtual bool SetPageText(size_t n, const wxString& strText);
+    virtual wxString GetPageText(size_t n) const;
+
+    virtual int GetPageImage(size_t n) const;
+    virtual bool SetPageImage(size_t n, int imageId);
+
+    virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text,
+        bool bSelect = false, int imageId = -1);
+
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+
+    int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
+    int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
+
+    virtual QTabWidget *GetHandle() const;
+
+protected:
+    virtual wxWindow *DoRemovePage(size_t page);
+    int DoSetSelection(size_t nPage, int flags = 0);
+
+private:
+    QTabWidget *m_qtTabWidget;
+
+    // internal array to store imageId for each page:
+    wxVector<int> m_images;
+
+    wxDECLARE_DYNAMIC_CLASS( wxNotebook );
+};
+
+
+#endif // _WX_QT_NOTEBOOK_H_
diff --git a/include/wx/qt/palette.h b/include/wx/qt/palette.h
new file mode 100644
index 0000000000..d3aeff38ab
--- /dev/null
+++ b/include/wx/qt/palette.h
@@ -0,0 +1,28 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/palette.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_PALETTE_H_
+#define _WX_QT_PALETTE_H_
+
+class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
+{
+public:
+    wxPalette();
+    wxPalette(int n, unsigned char *red, unsigned char *green, unsigned char *blue);
+    
+    bool Create(int n, unsigned char *red, unsigned char *green, unsigned char *blue);
+    
+    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+};
+
+#endif // _WX_QT_PALETTE_H_
diff --git a/include/wx/qt/pen.h b/include/wx/qt/pen.h
new file mode 100644
index 0000000000..bbaad08379
--- /dev/null
+++ b/include/wx/qt/pen.h
@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/pen.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_PEN_H_
+#define _WX_QT_PEN_H_
+
+#include <QtCore/Qt>
+
+class QPen;
+
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase
+{
+public:
+    wxPen();
+
+    wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
+
+    wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
+    wxPen(const wxColour& col, int width, int style);
+
+    bool operator==(const wxPen& pen) const;
+    bool operator!=(const wxPen& pen) const;
+
+    virtual void SetColour(const wxColour& col);
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
+
+    virtual void SetWidth(int width);
+    virtual void SetStyle(wxPenStyle style);
+    virtual void SetStipple(const wxBitmap& stipple);
+    virtual void SetDashes(int nb_dashes, const wxDash *dash);
+    virtual void SetJoin(wxPenJoin join);
+    virtual void SetCap(wxPenCap cap);
+
+    virtual wxColour GetColour() const;
+    virtual wxBitmap *GetStipple() const;
+    virtual wxPenStyle GetStyle() const;
+    virtual wxPenJoin GetJoin() const;
+    virtual wxPenCap GetCap() const;
+    virtual int GetWidth() const;
+    virtual int GetDashes(wxDash **ptr) const;
+
+    wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
+    void SetStyle(int style) { SetStyle((wxPenStyle)style); }
+        
+    QPen GetHandle() const;
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+};
+
+#endif // _WX_QT_PEN_H_
diff --git a/include/wx/qt/popupwin.h b/include/wx/qt/popupwin.h
new file mode 100644
index 0000000000..1a86e39b79
--- /dev/null
+++ b/include/wx/qt/popupwin.h
@@ -0,0 +1,23 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/popupwin.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_POPUPWIN_H_
+#define _WX_QT_POPUPWIN_H_
+
+class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
+{
+public:
+    wxPopupWindow();
+    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
+
+protected:
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+};
+
+#endif // _WX_QT_POPUPWIN_H_
diff --git a/include/wx/qt/printdlg.h b/include/wx/qt/printdlg.h
new file mode 100644
index 0000000000..fc9fb91afe
--- /dev/null
+++ b/include/wx/qt/printdlg.h
@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/printdlg.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_PRINTDLG_H_
+#define _WX_QT_PRINTDLG_H_
+
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
+
+class WXDLLIMPEXP_CORE wxQtPrintNativeData: public wxPrintNativeDataBase
+{
+public:
+    wxQtPrintNativeData();
+    
+    virtual bool TransferTo( wxPrintData &data );
+    virtual bool TransferFrom( const wxPrintData &data );
+
+    virtual bool IsOk() const;
+    
+};
+
+class WXDLLIMPEXP_CORE wxQtPrintDialog : public wxPrintDialogBase
+{
+public:
+    wxQtPrintDialog(wxWindow *parent, wxPrintDialogData *data);
+    wxQtPrintDialog(wxWindow *parent, wxPrintData *data);
+
+    virtual wxPrintDialogData& GetPrintDialogData();
+    virtual wxPrintData& GetPrintData();
+    virtual wxDC *GetPrintDC();
+
+protected:
+
+private:
+};
+
+
+
+class WXDLLIMPEXP_CORE wxQtPageSetupDialog: public wxPageSetupDialogBase
+{
+public:
+    wxQtPageSetupDialog();
+    wxQtPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+
+    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+
+    virtual wxPageSetupDialogData& GetPageSetupDialogData();
+
+private:
+};
+
+#endif // _WX_QT_PRINTDLG_H_
diff --git a/include/wx/qt/printqt.h b/include/wx/qt/printqt.h
new file mode 100644
index 0000000000..23d5dcb1bb
--- /dev/null
+++ b/include/wx/qt/printqt.h
@@ -0,0 +1,42 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/printqt.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_PRINTQT_H_
+#define _WX_QT_PRINTQT_H_
+
+#include "wx/prntbase.h"
+
+class WXDLLIMPEXP_CORE wxQtPrinter : public wxPrinterBase
+{
+public:
+    wxQtPrinter( wxPrintDialogData *data = NULL );
+
+    virtual bool Setup(wxWindow *parent);
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+private:
+};
+
+
+
+class WXDLLIMPEXP_CORE wxQtPrintPreview : public wxPrintPreviewBase
+{
+public:
+    wxQtPrintPreview(wxPrintout *printout,
+                          wxPrintout *printoutForPrinting = NULL,
+                          wxPrintDialogData *data = NULL);
+    wxQtPrintPreview(wxPrintout *printout,
+                          wxPrintout *printoutForPrinting,
+                          wxPrintData *data);
+    
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
+
+protected:
+};
+
+#endif // _WX_QT_PRINTQT_H_
diff --git a/include/wx/qt/private/converter.h b/include/wx/qt/private/converter.h
new file mode 100644
index 0000000000..5bc0f2d8f8
--- /dev/null
+++ b/include/wx/qt/private/converter.h
@@ -0,0 +1,58 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/converter.h
+// Purpose:     Converter utility classes and functions
+// Author:      Peter Most, Kolya Kosenko
+// Created:     02/28/10
+// Copyright:   (c) Peter Most
+//              (c) 2010 Kolya Kosenko
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CONVERTER_H_
+#define _WX_QT_CONVERTER_H_
+
+#include "wx/defs.h"
+#include <QtCore/Qt>
+
+// Rely on overloading and let the compiler pick the correct version, which makes
+// them easier to use then to write wxQtConvertQtRectToWxRect() or wxQtConvertWxRectToQtRect()
+
+class WXDLLIMPEXP_FWD_CORE wxPoint;
+class QPoint;
+wxPoint wxQtConvertPoint( const QPoint &point );
+QPoint wxQtConvertPoint( const wxPoint &point );
+
+class WXDLLIMPEXP_FWD_CORE wxRect;
+class QRect;
+wxRect wxQtConvertRect( const QRect &rect );
+QRect  wxQtConvertRect( const wxRect &rect );
+
+class WXDLLIMPEXP_FWD_BASE wxString;
+class QString;
+wxString wxQtConvertString( const QString &str );
+QString  wxQtConvertString( const wxString &str );
+
+#if wxUSE_DATETIME
+
+class WXDLLIMPEXP_FWD_BASE wxDateTime;
+class QDate;
+
+wxDateTime wxQtConvertDate(const QDate& date);
+QDate wxQtConvertDate(const wxDateTime& date);
+
+#endif // wxUSE_DATETIME
+
+class WXDLLIMPEXP_FWD_BASE wxSize;
+class QSize;
+wxSize wxQtConvertSize( const QSize  &size );
+QSize  wxQtConvertSize( const wxSize &size );
+
+Qt::Orientation wxQtConvertOrientation( long style, wxOrientation defaultOrientation );
+wxOrientation wxQtConvertOrientation( Qt::Orientation );
+
+wxKeyCode wxQtConvertKeyCode( int key, const Qt::KeyboardModifiers modifiers );
+void wxQtFillKeyboardModifiers( Qt::KeyboardModifiers modifiers, wxKeyboardState *state );
+int wxQtConvertKeyCode( int keyCode, int modifiers, Qt::KeyboardModifiers &qtmodifiers );
+
+#endif // _WX_QT_CONVERTER_H_
+
diff --git a/include/wx/qt/private/utils.h b/include/wx/qt/private/utils.h
new file mode 100644
index 0000000000..6bbd7340e8
--- /dev/null
+++ b/include/wx/qt/private/utils.h
@@ -0,0 +1,30 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/utils.h
+// Purpose:     utility classes and/or functions
+// Author:      Peter Most, Javier Torres
+// Created:     15/05/10
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_UTILS_H_
+#define _WX_QT_UTILS_H_
+
+#include "wx/mousestate.h"
+#include <QtCore/Qt>
+
+void wxQtFillMouseButtons( Qt::MouseButtons buttons, wxMouseState *state );
+
+void wxMissingImplementation( const char fileName[], unsigned lineNumber,
+    const char feature[] );
+
+#define wxMISSING_IMPLEMENTATION( feature )\
+    wxMissingImplementation( __FILE__, __LINE__, feature )
+
+#define wxMISSING_FUNCTION() \
+    wxMISSING_IMPLEMENTATION( __WXFUNCTION__ )
+
+// global function handle Qt objects destruction (just for debugging now)
+void wxQtHandleDestroyedSignal(QObject *qobj = 0);
+
+#endif // _WX_QT_UTILS_H_
diff --git a/include/wx/qt/private/winevent.h b/include/wx/qt/private/winevent.h
new file mode 100644
index 0000000000..45e94f0672
--- /dev/null
+++ b/include/wx/qt/private/winevent.h
@@ -0,0 +1,332 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/qt/winevent_qt.h
+// Purpose:     QWidget to wxWindow event handler
+// Author:      Javier Torres, Peter Most
+// Modified by:
+// Created:     21.06.10
+// Copyright:   (c) Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_EVENTSIGNALFORWARDER_H_
+#define _WX_QT_EVENTSIGNALFORWARDER_H_
+
+#include "wx/window.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/utils.h"
+
+#include <QtCore/QEvent>
+#include <QtGui/QPaintEvent>
+
+template< typename Handler >
+class wxQtSignalHandler
+{
+protected:
+    wxQtSignalHandler( Handler *handler )
+    {
+        m_handler = handler;
+    }
+
+    void EmitEvent( wxEvent &event ) const
+    {
+        wxWindow *handler = GetHandler();
+        event.SetEventObject( handler );
+        handler->HandleWindowEvent( event );
+    }
+
+    virtual Handler *GetHandler() const
+    {
+        return m_handler;
+    }
+
+private:
+    Handler *m_handler;
+};
+
+template < typename Widget, typename Handler >
+class wxQtEventSignalHandler : public Widget, public wxQtSignalHandler< Handler >
+{
+public:
+    wxQtEventSignalHandler( wxWindow *parent, Handler *handler )
+        : Widget( parent != NULL ? parent->GetHandle() : NULL )
+        , wxQtSignalHandler< Handler >( handler )
+    {
+        // Set immediatelly as it is used to check if wxWindow is alive
+        wxWindow::QtStoreWindowPointer( this, handler );
+
+        // Handle QWidget destruction signal AFTER it gets deleted
+        QObject::connect( this, &QObject::destroyed, this,
+                          &wxQtEventSignalHandler::HandleDestroyedSignal );
+
+    }
+
+    void HandleDestroyedSignal()
+    {
+        wxQtHandleDestroyedSignal(this);
+    }
+
+    virtual Handler *GetHandler() const
+    {
+        // Only process the signal / event if the wxWindow is not destroyed
+        if ( !wxWindow::QtRetrieveWindowPointer( this ) )
+        {
+            wxLogDebug( wxT("%s win pointer is NULL (wxWindow is deleted)!"),
+                        Widget::staticMetaObject.className()
+                        );
+            return NULL;
+        }
+        else
+            return wxQtSignalHandler< Handler >::GetHandler();
+    }
+
+protected:
+    /* Not implemented here: wxHelpEvent, wxIdleEvent wxJoystickEvent,
+     * wxMouseCaptureLostEvent, wxMouseCaptureChangedEvent,
+     * wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */
+
+    //wxActivateEvent
+    virtual void changeEvent ( QEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::changeEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleChangeEvent(this, event) )
+            Widget::changeEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxCloseEvent
+    virtual void closeEvent ( QCloseEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::closeEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleCloseEvent(this, event) )
+            Widget::closeEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxContextMenuEvent
+    virtual void contextMenuEvent ( QContextMenuEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::contextMenuEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleContextMenuEvent(this, event) )
+            Widget::contextMenuEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxDropFilesEvent
+    //virtual void dropEvent ( QDropEvent * event ) { }
+
+    //wxMouseEvent
+    virtual void enterEvent ( QEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::enterEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleEnterEvent(this, event) )
+            Widget::enterEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxFocusEvent.
+    virtual void focusInEvent ( QFocusEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::focusInEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleFocusEvent(this, event) )
+            Widget::focusInEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxFocusEvent.
+    virtual void focusOutEvent ( QFocusEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::focusOutEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleFocusEvent(this, event) )
+            Widget::focusOutEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxShowEvent
+    virtual void hideEvent ( QHideEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::hideEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleShowEvent(this, event) )
+            Widget::hideEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxKeyEvent
+    virtual void keyPressEvent ( QKeyEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::keyPressEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleKeyEvent(this, event) )
+            Widget::keyPressEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxKeyEvent
+    virtual void keyReleaseEvent ( QKeyEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::keyReleaseEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleKeyEvent(this, event) )
+            Widget::keyReleaseEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxMouseEvent
+    virtual void leaveEvent ( QEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::leaveEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleEnterEvent(this, event) )
+            Widget::leaveEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxMouseEvent
+    virtual void mouseDoubleClickEvent ( QMouseEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::mouseDoubleClickEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleMouseEvent(this, event) )
+            Widget::mouseDoubleClickEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxMouseEvent
+    virtual void mouseMoveEvent ( QMouseEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::mouseMoveEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleMouseEvent(this, event) )
+            Widget::mouseMoveEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxMouseEvent
+    virtual void mousePressEvent ( QMouseEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::mousePressEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleMouseEvent(this, event) )
+            Widget::mousePressEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxMouseEvent
+    virtual void mouseReleaseEvent ( QMouseEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::mouseReleaseEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleMouseEvent(this, event) )
+            Widget::mouseReleaseEvent(event);
+        else
+            event->accept();
+    }
+    
+    //wxMoveEvent
+    virtual void moveEvent ( QMoveEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::moveEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleMoveEvent(this, event) )
+            Widget::moveEvent(event);
+        else
+            event->accept();
+    }
+    
+    //wxEraseEvent then wxPaintEvent
+    virtual void paintEvent ( QPaintEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::paintEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandlePaintEvent(this, event) )
+            Widget::paintEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxSizeEvent
+    virtual void resizeEvent ( QResizeEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::resizeEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleResizeEvent(this, event) )
+            Widget::resizeEvent(event);
+        else
+            event->accept();
+    }
+
+    //wxShowEvent
+    virtual void showEvent ( QShowEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::showEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleShowEvent(this, event) )
+            Widget::showEvent(event);
+        else
+            event->accept();
+    }
+    
+    //wxMouseEvent
+    virtual void wheelEvent ( QWheelEvent * event )
+    {
+        if ( !this->GetHandler() )
+            wxLogDebug( wxT("%s::wheelEvent for invalid handler!"),
+                        Widget::staticMetaObject.className() );
+        else if ( !this->GetHandler()->QtHandleWheelEvent(this, event) )
+            Widget::wheelEvent(event);
+        else
+            event->accept();
+    }
+
+    /* Unused Qt events
+    virtual void actionEvent ( QActionEvent * event ) { }
+    virtual void dragEnterEvent ( QDragEnterEvent * event ) { }
+    virtual void dragLeaveEvent ( QDragLeaveEvent * event ) { }
+    virtual void dragMoveEvent ( QDragMoveEvent * event ) { }
+    virtual void inputMethodEvent ( QInputMethodEvent * event ) { }
+    virtual bool macEvent ( EventHandlerCallRef caller, EventRef event ) { }
+    virtual bool qwsEvent ( QWSEvent * event ) { }
+    virtual void tabletEvent ( QTabletEvent * event ) { }
+    virtual bool winEvent ( MSG * message, long * result ) { }
+    virtual bool x11Event ( XEvent * event ) { } */
+
+};
+
+#endif
diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h
new file mode 100644
index 0000000000..54016ae3d0
--- /dev/null
+++ b/include/wx/qt/radiobox.h
@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/radiobox.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_RADIOBOX_H_
+#define _WX_QT_RADIOBOX_H_
+
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QVBoxLayout>
+
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
+{
+public:
+    wxRadioBox();
+
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               int majorDim = 0,
+               long style = wxRA_SPECIFY_COLS,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr);
+
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 0,
+               long style = wxRA_SPECIFY_COLS,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                int majorDim = 0,
+                long style = wxRA_SPECIFY_COLS,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_SPECIFY_COLS,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);
+
+    using wxWindowBase::Show;
+    using wxWindowBase::Enable;
+    using wxRadioBoxBase::GetDefaultBorder;
+
+    virtual bool Enable(unsigned int n, bool enable = true);
+    virtual bool Show(unsigned int n, bool show = true);
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;
+
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
+
+    virtual QGroupBox *GetHandle() const;
+
+private:
+    // The 'visual' group box:
+    QGroupBox *m_qtGroupBox;
+
+    // Handles the mutual exclusion of buttons:
+    QButtonGroup *m_qtButtonGroup;
+
+    // Autofit layout for buttons (either vert. or horiz.):
+    QBoxLayout *m_qtBoxLayout;
+
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+};
+
+#endif // _WX_QT_RADIOBOX_H_
diff --git a/include/wx/qt/radiobut.h b/include/wx/qt/radiobut.h
new file mode 100644
index 0000000000..164a0c3f4e
--- /dev/null
+++ b/include/wx/qt/radiobut.h
@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/radiobut.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_RADIOBUT_H_
+#define _WX_QT_RADIOBUT_H_
+
+#include <QtWidgets/QRadioButton>
+
+class WXDLLIMPEXP_CORE wxRadioButton : public wxControl
+{
+public:
+    wxRadioButton();
+    wxRadioButton( wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxRadioButtonNameStr );
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id,
+                 const wxString& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxRadioButtonNameStr );
+
+    virtual void SetValue(bool value);
+    virtual bool GetValue() const;
+
+    virtual QRadioButton *GetHandle() const;
+
+protected:
+
+private:
+    QRadioButton *m_qtRadioButton;
+
+    wxDECLARE_DYNAMIC_CLASS( wxRadioButton );
+};
+
+#endif // _WX_QT_RADIOBUT_H_
diff --git a/include/wx/qt/region.h b/include/wx/qt/region.h
new file mode 100644
index 0000000000..c5ffb699a3
--- /dev/null
+++ b/include/wx/qt/region.h
@@ -0,0 +1,86 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/region.h
+// Purpose:     header for wxRegion
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_REGION_H_
+#define _WX_QT_REGION_H_
+
+#include <QtGui/QRegion>
+
+class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
+{
+public:
+    wxRegion();
+    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
+    wxRegion(const wxRect& rect);
+    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+    wxRegion(const wxBitmap& bmp);
+    wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
+    
+    virtual bool IsEmpty() const;
+    virtual void Clear();
+
+    virtual QRegion GetHandle() const;
+    virtual void QtSetRegion(QRegion region); // Hangs on to this region
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    virtual bool DoIsEqual(const wxRegion& region) const;
+    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
+    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
+    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
+
+    virtual bool DoOffset(wxCoord x, wxCoord y);
+
+    virtual bool DoUnionWithRect(const wxRect& rect);
+    virtual bool DoUnionWithRegion(const wxRegion& region);
+
+    virtual bool DoIntersect(const wxRegion& region);
+    virtual bool DoSubtract(const wxRegion& region);
+    virtual bool DoXor(const wxRegion& region);
+    
+private:
+};
+
+
+
+class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
+{
+public:
+    wxRegionIterator();
+    wxRegionIterator(const wxRegion& region);
+    wxRegionIterator(const wxRegionIterator& ri);
+    ~wxRegionIterator();
+
+    wxRegionIterator& operator=(const wxRegionIterator& ri);
+
+    void Reset();
+    void Reset(const wxRegion& region);
+
+    bool HaveRects() const;
+    operator bool () const;
+
+    wxRegionIterator& operator ++ ();
+    wxRegionIterator operator ++ (int);
+
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const;
+    wxCoord GetH() const;
+    wxCoord GetHeight() const;
+    wxRect GetRect() const;
+    
+private:
+    QVector< QRect > *m_qtRects;
+    int m_pos;
+};
+
+#endif // _WX_QT_REGION_H_
diff --git a/include/wx/qt/scrolbar.h b/include/wx/qt/scrolbar.h
new file mode 100644
index 0000000000..1ec47d1810
--- /dev/null
+++ b/include/wx/qt/scrolbar.h
@@ -0,0 +1,54 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/scrolbar.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_SCROLBAR_H_
+#define _WX_QT_SCROLBAR_H_
+
+#include "wx/scrolbar.h"
+
+#include <QtWidgets/QScrollBar>
+
+class WXDLLIMPEXP_FWD_CORE wxQtScrollBar;
+
+class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase
+{
+public:
+    wxScrollBar();
+    wxScrollBar( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = wxSB_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxScrollBarNameStr );
+
+    bool Create( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = wxSB_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxScrollBarNameStr );
+
+    virtual int GetThumbPosition() const;
+    virtual int GetThumbSize() const;
+    virtual int GetPageSize() const;
+    virtual int GetRange() const;
+
+    virtual void SetThumbPosition(int viewStart);
+    virtual void SetScrollbar(int position, int thumbSize,
+                              int range, int pageSize,
+                              bool refresh = true);
+
+    virtual QScrollBar* GetHandle() const;
+
+private:
+    QScrollBar *m_qtScrollBar;
+
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+};
+
+
+#endif // _WX_QT_SCROLBAR_H_
diff --git a/include/wx/qt/slider.h b/include/wx/qt/slider.h
new file mode 100644
index 0000000000..1c103d094c
--- /dev/null
+++ b/include/wx/qt/slider.h
@@ -0,0 +1,61 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/slider.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_SLIDER_H_
+#define _WX_QT_SLIDER_H_
+
+#include <QtWidgets/QSlider>
+
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
+{
+public:
+    wxSlider();
+    wxSlider(wxWindow *parent,
+             wxWindowID id,
+             int value, int minValue, int maxValue,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxSL_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxSliderNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                int value, int minValue, int maxValue,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSL_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxSliderNameStr);
+
+    virtual int GetValue() const;
+    virtual void SetValue(int value);
+
+    virtual void SetRange(int minValue, int maxValue);
+    virtual int GetMin() const;
+    virtual int GetMax() const;
+
+    virtual void DoSetTickFreq(int freq);
+    virtual int GetTickFreq() const;
+
+    virtual void SetLineSize(int lineSize);
+    virtual void SetPageSize(int pageSize);
+    virtual int GetLineSize() const;
+    virtual int GetPageSize() const;
+
+    virtual void SetThumbLength(int lenPixels);
+    virtual int GetThumbLength() const;
+
+    virtual QSlider *GetHandle() const;
+
+private:
+    QSlider *m_qtSlider;
+
+    wxDECLARE_DYNAMIC_CLASS( wxSlider );
+};
+
+#endif // _WX_QT_SLIDER_H_
diff --git a/include/wx/qt/spinbutt.h b/include/wx/qt/spinbutt.h
new file mode 100644
index 0000000000..43fde4069d
--- /dev/null
+++ b/include/wx/qt/spinbutt.h
@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/spinbutt.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_SPINBUTT_H_
+#define _WX_QT_SPINBUTT_H_
+
+#include "wx/spinbutt.h"
+#include <QtWidgets/QSpinBox>
+
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
+{
+public:
+    wxSpinButton();
+    wxSpinButton(wxWindow *parent,
+                 wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxSP_VERTICAL,
+                 const wxString& name = wxSPIN_BUTTON_NAME);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_VERTICAL,
+                const wxString& name = wxSPIN_BUTTON_NAME);
+
+    virtual int GetValue() const;
+    virtual void SetValue(int val);
+
+    virtual QSpinBox *GetHandle() const;
+
+private:
+    QSpinBox *m_qtSpinBox;
+
+    wxDECLARE_DYNAMIC_CLASS( wxSpinButton );
+};
+
+#endif // _WX_QT_SPINBUTT_H_
diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h
new file mode 100644
index 0000000000..6794074fc2
--- /dev/null
+++ b/include/wx/qt/spinctrl.h
@@ -0,0 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/spinctrl.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_SPINCTRL_H_
+#define _WX_QT_SPINCTRL_H_
+
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QDoubleSpinBox>
+
+// Take advantage of the Qt compile time polymorphy and use a template to avoid
+// copy&paste code for the usage of QSpinBox/QDoubleSpinBox.
+
+template < typename T, typename Widget >
+class WXDLLIMPEXP_CORE wxSpinCtrlQt : public wxSpinCtrlBase
+{
+public:
+    wxSpinCtrlQt();
+    wxSpinCtrlQt( wxWindow *parent, wxWindowID id, const wxString& value,
+        const wxPoint& pos, const wxSize& size, long style,
+        T min, T max, T initial, T inc,
+        const wxString& name );
+
+    bool Create( wxWindow *parent, wxWindowID id, const wxString& value,
+        const wxPoint& pos, const wxSize& size, long style,
+        T min, T max, T initial, T inc,
+        const wxString& name );
+
+    virtual void SetValue(const wxString&) {}
+
+    virtual void SetSnapToTicks(bool snap_to_ticks);
+    virtual bool GetSnapToTicks() const;
+
+    virtual void SetSelection(long from, long to);
+
+    virtual void SetValue(T val);
+    void SetRange(T minVal, T maxVal);
+    void SetIncrement(T inc);
+
+    T GetValue() const;
+    T GetMin() const;
+    T GetMax() const;
+    T GetIncrement() const;
+
+    virtual Widget *GetHandle() const;
+
+protected:
+    Widget *m_qtSpinBox;
+
+};
+
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlQt< int, QSpinBox >
+{
+public:
+    wxSpinCtrl();
+    wxSpinCtrl(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               int min = 0, int max = 100, int initial = 0,
+               const wxString& name = wxT("wxSpinCtrl"));
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                int min = 0, int max = 100, int initial = 0,
+                const wxString& name = wxT("wxSpinCtrl"));
+    virtual int GetBase() const wxOVERRIDE { return m_base; }
+    virtual bool SetBase(int base) wxOVERRIDE;
+    virtual void SetValue(const wxString & val);
+    virtual void SetValue(int val) { wxSpinCtrlQt::SetValue(val); }
+
+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_base = 10;
+    }
+    int m_base;
+    DECLARE_DYNAMIC_CLASS( wxSpinCtrl )
+};
+
+class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlQt< double, QDoubleSpinBox >
+{
+public:
+    wxSpinCtrlDouble();
+    wxSpinCtrlDouble(wxWindow *parent,
+                     wxWindowID id = wxID_ANY,
+                     const wxString& value = wxEmptyString,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                     double min = 0, double max = 100, double initial = 0,
+                     double inc = 1,
+                     const wxString& name = wxT("wxSpinCtrlDouble"));
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                double min = 0, double max = 100, double initial = 0,
+                double inc = 1,
+                const wxString& name = wxT("wxSpinCtrlDouble"));
+
+    void SetDigits(unsigned digits);
+    unsigned GetDigits() const;
+
+    virtual int GetBase() const wxOVERRIDE { return 10; }
+    virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
+    virtual void SetValue(const wxString & val);
+    virtual void SetValue(double val) { wxSpinCtrlQt::SetValue(val); }
+
+private:
+    wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );
+};
+
+#endif // _WX_QT_SPINCTRL_H_
diff --git a/include/wx/qt/statbmp.h b/include/wx/qt/statbmp.h
new file mode 100644
index 0000000000..504ce23f7b
--- /dev/null
+++ b/include/wx/qt/statbmp.h
@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/statbmp.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_STATBMP_H_
+#define _WX_QT_STATBMP_H_
+
+#include <QtWidgets/QLabel>
+
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
+{
+public:
+    wxStaticBitmap();
+    wxStaticBitmap( wxWindow *parent,
+                    wxWindowID id,
+                    const wxBitmap& label,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = 0,
+                    const wxString& name = wxStaticBitmapNameStr );
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id,
+                 const wxBitmap& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxStaticBitmapNameStr);
+
+    virtual void SetIcon(const wxIcon& icon);
+    virtual void SetBitmap(const wxBitmap& bitmap);
+    virtual wxBitmap GetBitmap() const;
+    virtual wxIcon GetIcon() const;
+
+    virtual QLabel *GetHandle() const;
+protected:
+
+private:
+    QLabel *m_qtLabel;
+
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+};
+
+#endif // _WX_QT_STATBMP_H_
diff --git a/include/wx/qt/statbox.h b/include/wx/qt/statbox.h
new file mode 100644
index 0000000000..4259f74ec1
--- /dev/null
+++ b/include/wx/qt/statbox.h
@@ -0,0 +1,44 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/statbox.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_STATBOX_H_
+#define _WX_QT_STATBOX_H_
+
+#include <QtWidgets/QGroupBox>
+
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
+{
+public:
+    wxStaticBox();
+    
+    wxStaticBox(wxWindow *parent, wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr);
+
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+
+    virtual QGroupBox *GetHandle() const;
+
+protected:
+
+private:
+    QGroupBox *m_qtGroupBox;
+
+    wxDECLARE_DYNAMIC_CLASS( wxStaticBox );
+};
+
+#endif // _WX_QT_STATBOX_H_
diff --git a/include/wx/qt/statline.h b/include/wx/qt/statline.h
new file mode 100644
index 0000000000..d65706b683
--- /dev/null
+++ b/include/wx/qt/statline.h
@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/statline.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_STATLINE_H_
+#define _WX_QT_STATLINE_H_
+
+#include <QtWidgets/QFrame>
+
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
+{
+public:
+    wxStaticLine();
+
+    wxStaticLine( wxWindow *parent,
+                  wxWindowID id = wxID_ANY,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
+                  long style = wxLI_HORIZONTAL,
+                  const wxString &name = wxStaticLineNameStr );
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxLI_HORIZONTAL,
+                 const wxString &name = wxStaticLineNameStr );
+
+    virtual QFrame *GetHandle() const;
+
+private:
+    QFrame *m_qtFrame;
+
+    wxDECLARE_DYNAMIC_CLASS( wxStaticLine );
+};
+
+#endif // _WX_QT_STATLINE_H_
diff --git a/include/wx/qt/stattext.h b/include/wx/qt/stattext.h
new file mode 100644
index 0000000000..0aae47e778
--- /dev/null
+++ b/include/wx/qt/stattext.h
@@ -0,0 +1,42 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/stattext.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_STATTEXT_H_
+#define _WX_QT_STATTEXT_H_
+
+#include <QtWidgets/QLabel>
+
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
+{
+public:
+    wxStaticText();
+    wxStaticText(wxWindow *parent,
+                 wxWindowID id,
+                 const wxString &label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticTextNameStr );
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString &label,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = 0,
+                const wxString &name = wxStaticTextNameStr );
+
+    void SetLabel(const wxString& label);
+
+    QLabel *GetHandle() const;
+private:
+    QLabel *m_qtLabel;
+
+    wxDECLARE_DYNAMIC_CLASS( wxStaticText );
+};
+
+#endif // _WX_QT_STATTEXT_H_
diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h
new file mode 100644
index 0000000000..bbc0db5aed
--- /dev/null
+++ b/include/wx/qt/statusbar.h
@@ -0,0 +1,51 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/statusbar.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_STATUSBAR_H_
+#define _WX_QT_STATUSBAR_H_
+
+#include "wx/statusbr.h"
+
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QStatusBar>
+
+class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase
+{
+public:
+    wxStatusBar() {}
+    wxStatusBar(wxWindow *parent, wxWindowID winid = wxID_ANY,
+                long style = wxSTB_DEFAULT_STYLE,
+                const wxString& name = wxStatusBarNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
+                long style = wxSTB_DEFAULT_STYLE,
+                const wxString& name = wxStatusBarNameStr);
+
+    virtual bool GetFieldRect(int i, wxRect& rect) const;
+    virtual void SetMinHeight(int height);
+    virtual int GetBorderX() const;
+    virtual int GetBorderY() const;
+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = (const wxRect *) NULL );
+
+    virtual QStatusBar *GetHandle() const;
+
+protected:
+    virtual void DoUpdateStatusText(int number);
+
+private:
+    void Init();
+    void UpdateFields();
+
+    QStatusBar *m_qtStatusBar;
+    QList< QLabel* > m_qtPanes;
+
+    DECLARE_DYNAMIC_CLASS( wxStatusBar )
+};
+
+
+#endif // _WX_QT_STATUSBAR_H_
diff --git a/include/wx/qt/taskbar.h b/include/wx/qt/taskbar.h
new file mode 100644
index 0000000000..354a6a9557
--- /dev/null
+++ b/include/wx/qt/taskbar.h
@@ -0,0 +1,34 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/taskbar.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TASKBAR_H_
+#define _WX_QT_TASKBAR_H_
+
+#include <QtWidgets/QSystemTrayIcon>
+
+class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase
+{
+public:
+    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
+
+    // Accessors
+    bool IsOk() const { return false; }
+    bool IsIconInstalled() const { return false; }
+
+    // Operations
+    virtual bool SetIcon(const wxIcon& icon,
+                         const wxString& tooltip = wxEmptyString);
+    virtual bool RemoveIcon();
+    virtual bool PopupMenu(wxMenu *menu);
+
+private:
+    QSystemTrayIcon m_qtSystemTrayIcon;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
+};
+
+#endif // _WX_QT_TASKBAR_H_
diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h
new file mode 100644
index 0000000000..864165c88c
--- /dev/null
+++ b/include/wx/qt/textctrl.h
@@ -0,0 +1,79 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/textctrl.h
+// Author:      Mariano Reingart, Peter Most
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TEXTCTRL_H_
+#define _WX_QT_TEXTCTRL_H_
+
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
+{
+public:
+    wxTextCtrl();
+    wxTextCtrl(wxWindow *parent,
+               wxWindowID id,
+               const wxString &value = wxEmptyString,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString &name = wxTextCtrlNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString &value = wxEmptyString,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = wxTextCtrlNameStr);
+
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;
+
+    virtual bool IsModified() const;
+    virtual void MarkDirty();
+    virtual void DiscardEdits();
+
+    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
+    virtual bool GetStyle(long position, wxTextAttr& style);
+    virtual bool SetDefaultStyle(const wxTextAttr& style);
+    
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    virtual void SetInsertionPoint(long pos);
+    virtual long GetInsertionPoint() const;
+    virtual void SetSelection( long from, long to );
+    virtual void GetSelection(long *from, long *to) const;
+
+    virtual wxString DoGetValue() const;
+    virtual void DoSetValue(const wxString &text, int flags = 0);
+    virtual void WriteText(const wxString& text);
+
+    virtual QWidget *GetHandle() const;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    virtual bool DoLoadFile(const wxString& file, int fileType);
+    virtual bool DoSaveFile(const wxString& file, int fileType);
+
+    virtual QScrollArea *QtGetScrollBarsContainer() const;
+
+private:
+    QLineEdit *m_qtLineEdit;
+    QTextEdit *m_qtTextEdit;
+
+    wxDECLARE_DYNAMIC_CLASS( wxTextCtrl );
+};
+
+#endif // _WX_QT_TEXTCTRL_H_
diff --git a/include/wx/qt/textentry.h b/include/wx/qt/textentry.h
new file mode 100644
index 0000000000..33f3afea7d
--- /dev/null
+++ b/include/wx/qt/textentry.h
@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/textentry.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TEXTENTRY_H_
+#define _WX_QT_TEXTENTRY_H_
+
+class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
+{
+public:
+    wxTextEntry();
+
+    virtual void WriteText(const wxString& text);
+
+    virtual void Remove(long from, long to);
+
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+    
+    virtual void Undo();
+    virtual void Redo();
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    virtual void SetInsertionPoint(long pos);
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
+
+    virtual void SetSelection(long from, long to);
+    virtual void GetSelection(long *from, long *to) const;
+    
+    virtual bool IsEditable() const;
+    virtual void SetEditable(bool editable);
+    
+protected:
+    virtual wxString DoGetValue() const;
+    virtual void DoSetValue(const wxString& value, int flags=0);
+
+    virtual wxWindow *GetEditableWindow();
+
+private:
+};
+
+#endif // _WX_QT_TEXTENTRY_H_
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
new file mode 100644
index 0000000000..99f725be95
--- /dev/null
+++ b/include/wx/qt/tglbtn.h
@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/tglbtn.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TGLBTN_H_
+#define _WX_QT_TGLBTN_H_
+
+#include "wx/tglbtn.h"
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
+
+class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase
+{
+public:
+    wxBitmapToggleButton();
+    wxBitmapToggleButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxBitmap& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxCheckBoxNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize, long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxCheckBoxNameStr);
+
+    virtual void SetValue(bool state);
+    virtual bool GetValue() const;
+
+    virtual QPushButton *GetHandle() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
+
+};
+
+
+
+class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
+{
+public:
+    wxToggleButton();
+    wxToggleButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxCheckBoxNameStr);
+    
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize, long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxCheckBoxNameStr);
+
+    virtual void SetValue(bool state);
+    virtual bool GetValue() const;
+
+    virtual QPushButton *GetHandle() const;
+
+private:
+
+};
+
+#endif // _WX_QT_TGLBTN_H_
diff --git a/include/wx/qt/timer.h b/include/wx/qt/timer.h
new file mode 100644
index 0000000000..cfb875f8d9
--- /dev/null
+++ b/include/wx/qt/timer.h
@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/timer.h
+// Author:      Javier Torres
+// Copyright:   (c) Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TIMER_H_
+#define _WX_QT_TIMER_H_
+
+#if wxUSE_TIMER
+
+#include "wx/private/timer.h"
+
+#include <QtCore/QObject>
+
+//-----------------------------------------------------------------------------
+// wxTimer
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject
+{
+public:
+    wxQtTimerImpl( wxTimer* timer );
+
+    virtual bool Start( int millisecs = -1, bool oneShot = false );
+    virtual void Stop();
+    virtual bool IsRunning() const;
+
+protected:
+    virtual void timerEvent( QTimerEvent * event );
+    
+private:
+    int m_timerId;
+};
+
+#endif // wxUSE_TIMER
+
+#endif // _WX_QT_TIMER_H_
diff --git a/include/wx/qt/toolbar.h b/include/wx/qt/toolbar.h
new file mode 100644
index 0000000000..a4d70bf2bf
--- /dev/null
+++ b/include/wx/qt/toolbar.h
@@ -0,0 +1,77 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/toolbar.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include <QtWidgets/QToolBar>
+
+#ifndef _WX_QT_TOOLBAR_H_
+#define _WX_QT_TOOLBAR_H_
+
+class wxQtToolBar;
+
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
+{
+public:
+
+    wxToolBar() { Init(); }
+    wxToolBar(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxNO_BORDER | wxTB_HORIZONTAL,
+              const wxString& name = wxToolBarNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, style, name);
+    }
+
+    virtual ~wxToolBar();
+
+    void Init();
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr);
+
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+    virtual QToolBar *GetHandle() const;
+
+    virtual void SetWindowStyleFlag( long style );
+    virtual bool Realize() wxOVERRIDE;
+
+    virtual wxToolBarToolBase *CreateTool(int toolid,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
+
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
+
+protected:
+
+    QActionGroup* GetActionGroup(size_t pos);
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+private:
+    Qt::ToolButtonStyle GetButtonStyle();
+
+    QToolBar *m_qtToolBar;
+
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
+};
+
+#endif // _WX_QT_TOOLBAR_H_
diff --git a/include/wx/qt/tooltip.h b/include/wx/qt/tooltip.h
new file mode 100644
index 0000000000..703f03ad83
--- /dev/null
+++ b/include/wx/qt/tooltip.h
@@ -0,0 +1,41 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/tooltip.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TOOLTIP_H_
+#define _WX_QT_TOOLTIP_H_
+
+#include "wx/object.h"
+
+class WXDLLIMPEXP_CORE wxToolTip : public wxObject
+{
+public:
+    // controlling tooltip behaviour: globally change tooltip parameters
+        // enable or disable the tooltips globally
+    static void Enable(bool flag);
+        // set the delay after which the tooltip appears
+    static void SetDelay(long milliseconds);
+        // set the delay after which the tooltip disappears or how long the
+        // tooltip remains visible
+    static void SetAutoPop(long milliseconds);
+        // set the delay between subsequent tooltips to appear
+    static void SetReshow(long milliseconds);
+    
+    wxToolTip(const wxString &tip);
+
+    void SetTip(const wxString& tip);
+    const wxString& GetTip() const;
+
+    // the window we're associated with
+    void SetWindow(wxWindow *win);
+    wxWindow *GetWindow() const { return m_window; }
+
+private:
+    wxString m_text;
+    wxWindow* m_window;         // main window we're associated with
+};
+
+#endif // _WX_QT_TOOLTIP_H_
diff --git a/include/wx/qt/toplevel.h b/include/wx/qt/toplevel.h
new file mode 100644
index 0000000000..ae1c5cc553
--- /dev/null
+++ b/include/wx/qt/toplevel.h
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/toplevel.h
+// Purpose:     declares wxTopLevelWindowNative class
+// Author:      Peter Most, Javier Torres
+// Modified by:
+// Created:     09.08.09
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TOPLEVEL_H_
+#define _WX_QT_TOPLEVEL_H_
+
+class WXDLLIMPEXP_CORE wxTopLevelWindowQt : public wxTopLevelWindowBase
+{
+public:
+    wxTopLevelWindowQt();
+    wxTopLevelWindowQt(wxWindow *parent,
+               wxWindowID winid,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+    
+    virtual void Maximize(bool maximize = true);
+    virtual void Restore();
+    virtual void Iconize(bool iconize = true);
+    virtual bool IsMaximized() const;
+    virtual bool IsIconized() const;
+
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool IsFullScreen() const;
+    virtual void SetTitle(const wxString& title);
+    virtual wxString GetTitle() const;
+    virtual void SetIcons(const wxIconBundle& icons);
+    
+    // Styles
+    virtual void SetWindowStyleFlag( long style );
+    virtual long GetWindowStyleFlag() const;
+};
+    
+#endif // _WX_QT_TOPLEVEL_H_
diff --git a/include/wx/qt/treectrl.h b/include/wx/qt/treectrl.h
new file mode 100644
index 0000000000..e14af5fa18
--- /dev/null
+++ b/include/wx/qt/treectrl.h
@@ -0,0 +1,141 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/treectrl.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TREECTRL_H_
+#define _WX_QT_TREECTRL_H_
+
+#include <QtWidgets/QTreeWidget>
+
+class WXDLLIMPEXP_CORE wxTreeCtrl : public wxTreeCtrlBase
+{
+public:
+    wxTreeCtrl();
+    wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxTreeCtrlNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxTreeCtrlNameStr);
+
+    virtual unsigned int GetCount() const;
+    
+    virtual unsigned int GetIndent() const;
+    virtual void SetIndent(unsigned int indent);
+
+    virtual void SetImageList(wxImageList *imageList);
+    virtual void SetStateImageList(wxImageList *imageList);
+
+    virtual wxString GetItemText(const wxTreeItemId& item) const;
+    virtual int GetItemImage(const wxTreeItemId& item,
+                     wxTreeItemIcon which = wxTreeItemIcon_Normal) const;
+    virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const;
+    virtual wxColour GetItemTextColour(const wxTreeItemId& item) const;
+    virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const;
+    virtual wxFont GetItemFont(const wxTreeItemId& item) const;
+
+    virtual void SetItemText(const wxTreeItemId& item, const wxString& text);
+    virtual void SetItemImage(const wxTreeItemId& item,
+                              int image,
+                              wxTreeItemIcon which = wxTreeItemIcon_Normal);
+    virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data);
+    virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
+    virtual void SetItemBold(const wxTreeItemId& item, bool bold = true);
+    virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true);
+    virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
+    virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col);
+    virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font);
+    
+    virtual bool IsVisible(const wxTreeItemId& item) const;
+    virtual bool ItemHasChildren(const wxTreeItemId& item) const;
+    virtual bool IsExpanded(const wxTreeItemId& item) const;
+    virtual bool IsSelected(const wxTreeItemId& item) const;
+    virtual bool IsBold(const wxTreeItemId& item) const;
+    
+    virtual size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true) const;
+    
+    virtual wxTreeItemId GetRootItem() const;
+    virtual wxTreeItemId GetSelection() const;
+    virtual size_t GetSelections(wxArrayTreeItemIds& selections) const;
+
+    virtual void SetFocusedItem(const wxTreeItemId& item);
+    virtual void ClearFocusedItem();
+    virtual wxTreeItemId GetFocusedItem() const;
+
+    virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
+    
+    virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
+    virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
+    virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetFirstVisibleItem() const;
+    virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const;
+
+    virtual wxTreeItemId AddRoot(const wxString& text,
+                                 int image = -1, int selImage = -1,
+                                 wxTreeItemData *data = NULL);
+
+    virtual void Delete(const wxTreeItemId& item);
+    virtual void DeleteChildren(const wxTreeItemId& item);
+    virtual void DeleteAllItems();
+
+    virtual void Expand(const wxTreeItemId& item);
+    virtual void Collapse(const wxTreeItemId& item);
+    virtual void CollapseAndReset(const wxTreeItemId& item);
+    virtual void Toggle(const wxTreeItemId& item);
+
+    virtual void Unselect();
+    virtual void UnselectAll();
+    virtual void SelectItem(const wxTreeItemId& item, bool select = true);
+    virtual void SelectChildren(const wxTreeItemId& parent);
+
+    virtual void EnsureVisible(const wxTreeItemId& item);
+    virtual void ScrollTo(const wxTreeItemId& item);
+
+    virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl));
+    virtual wxTextCtrl *GetEditControl() const;
+    virtual void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false);
+
+    virtual void SortChildren(const wxTreeItemId& item);
+
+    virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const;
+
+    virtual QTreeWidget *GetHandle() const;
+
+protected:
+    virtual int DoGetItemState(const wxTreeItemId& item) const;
+    virtual void DoSetItemState(const wxTreeItemId& item, int state);
+
+    virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
+                                      size_t pos,
+                                      const wxString& text,
+                                      int image, int selImage,
+                                      wxTreeItemData *data);
+
+    virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent,
+                                       const wxTreeItemId& idPrevious,
+                                       const wxString& text,
+                                       int image = -1, int selImage = -1,
+                                       wxTreeItemData *data = NULL);
+
+    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const;
+
+private:
+    QTreeWidget *m_qtTreeWidget;
+
+    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+};
+
+#endif // _WX_QT_TREECTRL_H_
diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
new file mode 100644
index 0000000000..fe5d01cd6f
--- /dev/null
+++ b/include/wx/qt/window.h
@@ -0,0 +1,218 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/window.h
+// Purpose:     wxWindow class
+// Author:      Peter Most, Javier Torres, Mariano Reingart
+// Created:     09/08/09
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_WINDOW_H_
+#define _WX_QT_WINDOW_H_
+
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QScrollArea>
+
+class WXDLLIMPEXP_FWD_CORE wxScrollBar;
+class WXDLLIMPEXP_FWD_CORE wxQtShortcutHandler;
+
+/* wxQt specific notes:
+ *
+ * Remember to implement the Qt object getters on all subclasses:
+ *  - GetHandle() returns the Qt object
+ *  - QtGetScrollBarsContainer() returns the widget where scrollbars are placed
+ * For example, for wxFrame, GetHandle() is the QMainWindow,
+ * QtGetScrollBarsContainer() is the central widget and QtGetContainer() is a widget
+ * in a layout inside the central widget that also contains the scrollbars.
+ * Return 0 from QtGetScrollBarsContainer() to disable SetScrollBar() and friends
+ * for wxWindow subclasses.
+ *
+ *
+ * Event handling is achieved by using the template class wxQtEventForwarder
+ * found in winevent_qt.(h|cpp) to send all Qt events here to QtHandleXXXEvent()
+ * methods. All these methods receive the Qt event and the handler. This is
+ * done because events of the containers (the scrolled part of the window) are
+ * sent to the same wxWindow instance, that must be able to differenciate them
+ * as some events need different handling (paintEvent) depending on that.
+ * We pass the QWidget pointer to all event handlers for consistency.
+ */
+class WXDLLIMPEXP_CORE wxWindowQt : public wxWindowBase
+{
+public:
+    wxWindowQt();
+    ~wxWindowQt();
+    wxWindowQt(wxWindowQt *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxPanelNameStr);
+    
+    bool Create(wxWindowQt *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxPanelNameStr);
+    
+    // Used by all window classes in the widget creation process.
+    void PostCreation( bool generic = true );
+
+    void AddChild( wxWindowBase *child );
+
+    virtual bool Show( bool show = true );
+
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
+
+    virtual void DoEnable( bool enable );
+    virtual void SetFocus();
+
+    // Parent/Child:
+    static void QtReparent( QWidget *child, QWidget *parent );
+    virtual bool Reparent( wxWindowBase *newParent );
+    
+    // Z-order
+    virtual void Raise();
+    virtual void Lower();
+    
+    // move the mouse to the specified position
+    virtual void WarpPointer(int x, int y);
+
+    virtual void Update();
+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = (const wxRect *) NULL );
+
+    virtual bool SetFont(const wxFont& font);
+    
+    // get the (average) character size for the current font
+    virtual int GetCharHeight() const;
+    virtual int GetCharWidth() const;
+    
+    virtual void SetScrollbar( int orient,
+                               int pos,
+                               int thumbvisible,
+                               int range,
+                               bool refresh = true );
+    virtual void SetScrollPos( int orient, int pos, bool refresh = true );
+    virtual int GetScrollPos( int orient ) const;
+    virtual int GetScrollThumb( int orient ) const;
+    virtual int GetScrollRange( int orient ) const;
+
+        // scroll window to the specified position
+    virtual void ScrollWindow( int dx, int dy,
+                               const wxRect* rect = NULL );
+
+    // Styles
+    virtual void SetWindowStyleFlag( long style );
+    virtual void SetExtraStyle( long exStyle );
+
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
+    virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const;
+    virtual bool SetTransparent(wxByte alpha);
+    virtual bool CanSetTransparent() { return true; }
+
+    virtual WXWidget GetHandle() const;
+
+    virtual void SetDropTarget( wxDropTarget *dropTarget );
+    
+#if wxUSE_ACCEL
+    // accelerators
+    // ------------
+    virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );    
+#endif // wxUSE_ACCEL
+    
+    // wxQt implementation internals:
+
+    virtual QPicture *QtGetPicture() const;
+
+    QPainter *QtGetPainter();
+
+    virtual bool QtHandlePaintEvent  ( QWidget *handler, QPaintEvent *event );
+    virtual bool QtHandleResizeEvent ( QWidget *handler, QResizeEvent *event );
+    virtual bool QtHandleWheelEvent  ( QWidget *handler, QWheelEvent *event );
+    virtual bool QtHandleKeyEvent    ( QWidget *handler, QKeyEvent *event );
+    virtual bool QtHandleMouseEvent  ( QWidget *handler, QMouseEvent *event );
+    virtual bool QtHandleEnterEvent  ( QWidget *handler, QEvent *event );
+    virtual bool QtHandleMoveEvent   ( QWidget *handler, QMoveEvent *event );
+    virtual bool QtHandleShowEvent   ( QWidget *handler, QEvent *event );
+    virtual bool QtHandleChangeEvent ( QWidget *handler, QEvent *event );
+    virtual bool QtHandleCloseEvent  ( QWidget *handler, QCloseEvent *event );
+    virtual bool QtHandleContextMenuEvent  ( QWidget *handler, QContextMenuEvent *event );
+    virtual bool QtHandleFocusEvent  ( QWidget *handler, QFocusEvent *event );
+
+    static void QtStoreWindowPointer( QWidget *widget, const wxWindowQt *window );
+    static wxWindowQt *QtRetrieveWindowPointer( const QWidget *widget );
+
+#if wxUSE_ACCEL
+    virtual void QtHandleShortcut ( int command );
+#endif // wxUSE_ACCEL
+
+    virtual QAbstractScrollArea *QtGetScrollBarsContainer() const;
+
+protected:
+    virtual void DoGetTextExtent(const wxString& string,
+                                 int *x, int *y,
+                                 int *descent = NULL,
+                                 int *externalLeading = NULL,
+                                 const wxFont *font = NULL) const;
+
+    // coordinates translation
+    virtual void DoClientToScreen( int *x, int *y ) const;
+    virtual void DoScreenToClient( int *x, int *y ) const;
+
+    // capture/release the mouse, used by Capture/ReleaseMouse()
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
+    // retrieve the position/size of the window
+    virtual void DoGetPosition(int *x, int *y) const;
+
+    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual void DoGetSize(int *width, int *height) const;
+
+    // same as DoSetSize() for the client size
+    virtual void DoSetClientSize(int width, int height);
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip( wxToolTip *tip );
+#endif // wxUSE_TOOLTIPS
+
+#if wxUSE_MENUS
+    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
+#endif // wxUSE_MENUS
+
+    QWidget *m_qtWindow;
+
+private:
+    void Init();
+    QScrollArea *m_qtContainer;
+
+    wxScrollBar *m_horzScrollBar;
+    wxScrollBar *m_vertScrollBar;
+    void QtOnScrollBarEvent( wxScrollEvent& event );
+    
+    wxScrollBar *QtGetScrollBar( int orientation ) const;
+    wxScrollBar *QtSetScrollBar( int orientation, wxScrollBar *scrollBar=NULL );
+
+    bool QtSetBackgroundStyle();
+
+    QPicture *m_qtPicture;
+    QPainter *m_qtPainter;
+
+    bool m_mouseInside;
+
+#if wxUSE_ACCEL
+    QList< QShortcut* > m_qtShortcuts;
+    wxQtShortcutHandler *m_qtShortcutHandler;
+    bool m_processingShortcut;
+#endif // wxUSE_ACCEL
+
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxWindowQt );
+};
+
+#endif // _WX_QT_WINDOW_H_
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 54be1ea757..ab9c22a681 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -163,6 +163,8 @@ private:
     #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/radiobox.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/radiobox.h"
 #endif
 
 #endif // wxUSE_RADIOBOX
diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index efccb10536..11f466cdbe 100644
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -46,6 +46,8 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];
     #include "wx/gtk1/radiobut.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/radiobut.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/radiobut.h"
 #endif
 
 #endif // wxUSE_RADIOBTN
diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index c2b778a07f..1f89e5acc2 100644
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -168,6 +168,10 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     // Under DirectFB, RGB components are reversed, they're in BGR order
     typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
 
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXQT__)
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+    
     #define wxPIXEL_FORMAT_ALPHA 3
 #endif
 
diff --git a/include/wx/region.h b/include/wx/region.h
index 9e420d388c..1ee8fcb1f4 100644
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -222,6 +222,8 @@ protected:
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/region.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/region.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 2e2342a617..1352ae6c61 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -74,6 +74,8 @@ private:
     #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/scrolbar.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/scrolbar.h"
 #endif
 
 #endif // wxUSE_SCROLLBAR
diff --git a/include/wx/slider.h b/include/wx/slider.h
index a5b41cb1a7..7d615ca65f 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -139,6 +139,8 @@ private:
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/slider.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/slider.h"
 #endif
 
 #endif // wxUSE_SLIDER
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 6bc05f46a7..abf191b555 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -86,6 +86,8 @@ protected:
     #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/spinbutt.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/spinbutt.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 14e3d9777e..1d898e5c86 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -53,7 +53,6 @@ public:
     // The base for numbers display, e.g. 10 or 16.
     virtual int GetBase() const = 0;
     virtual bool SetBase(int base) = 0;
-
     // Select text in the textctrl
     virtual void SetSelection(long from, long to) = 0;
 
@@ -128,12 +127,15 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 #elif defined(__WXGTK__)
     #define wxHAS_NATIVE_SPINCTRL
     #include "wx/gtk1/spinctrl.h"
+#elif defined(__WXQT__)
+    #define wxHAS_NATIVE_SPINCTRL
+    #define wxHAS_NATIVE_SPINCTRLDOUBLE
+    #include "wx/qt/spinctrl.h"
 #endif // platform
 
 #if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
     #include "wx/generic/spinctlg.h"
 #endif
-
 namespace wxPrivate
 {
 
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 90b37e4308..c51c19086c 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -64,6 +64,8 @@ protected:
     #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/statbmp.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/statbmp.h"
 #endif
 
 #endif // wxUSE_STATBMP
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 3c9c546fd1..0db5ada56c 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -64,6 +64,8 @@ protected:
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/statbox.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/statbox.h"
 #endif
 
 #endif // wxUSE_STATBOX
diff --git a/include/wx/statline.h b/include/wx/statline.h
index 329e2b1be3..49023d58ba 100644
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -92,6 +92,8 @@ protected:
     #include "wx/gtk1/statline.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/statline.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/statline.h"
 #else // use generic implementation for all other platforms
     #include "wx/generic/statline.h"
 #endif
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 220d4a4a91..5b85b6c8f1 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -97,6 +97,8 @@ private:
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/stattext.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/stattext.h"
 #endif
 
 #endif // !wxNO_PORT_STATTEXT_INCLUDE
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 68b571a808..375ee8dfc0 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -237,6 +237,8 @@ protected:
     #define wxStatusBarMac wxStatusBar
     #include "wx/generic/statusbr.h"
     #include "wx/osx/statusbr.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/statusbar.h"
 #else
     #define wxStatusBarGeneric wxStatusBar
     #include "wx/generic/statusbr.h"
diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index aac7b58888..f97316cd53 100644
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -43,7 +43,7 @@ class WXDLLIMPEXP_ADV wxTaskBarIconBase : public wxEvtHandler
 public:
     wxTaskBarIconBase() { }
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXQT__)
     static bool IsAvailable();
 #else
     static bool IsAvailable() { return true; }
@@ -83,6 +83,8 @@ private:
     #include "wx/unix/taskbarx11.h"
 #elif defined (__WXMAC__)
     #include "wx/osx/taskbarosx.h"
+#elif defined (__WXQT__)
+    #include "wx/qt/taskbar.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index ed8563ee69..bbf4ff6b3d 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -785,6 +785,8 @@ protected:
     #include "wx/gtk1/textctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/textctrl.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/textctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index ed4a0b0e34..f3ab5398a2 100644
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -319,6 +319,8 @@ private:
     #include "wx/msw/textentry.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/textentry.h"
+#elif defined(__WXQT__)
+    #include "wx/qt/textentry.h"
 #else
     // no platform-specific implementation of wxTextEntry yet
     class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 3b7fcabcba..7cef5be1cc 100644
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -80,6 +80,8 @@ protected:
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"
     #define wxHAS_BITMAPTOGGLEBUTTON
+#elif defined(__WXQT__)
+    #include "wx/qt/tglbtn.h"
 #endif
 
 // old wxEVT_COMMAND_* constants
diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index b998da51e2..b219d1de19 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -81,6 +81,8 @@ enum
         #include "wx/gtk1/toolbar.h"
     #elif defined(__WXMAC__)
        #include "wx/osx/toolbar.h"
+    #elif defined(__WXQT__)
+        #include "wx/qt/toolbar.h"
     #endif
 #endif // wxUSE_TOOLBAR
 
diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 7f9fb15508..d65fef0b82 100644
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -25,6 +25,8 @@
 #include "wx/gtk1/tooltip.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/tooltip.h"
+#elif defined(__WXQT__)
+#include "wx/qt/tooltip.h"
 #endif
 
 #endif
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 401f54d997..559112a6fa 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -365,6 +365,9 @@ protected:
 #elif defined(__WXMOTIF__)
     #include "wx/motif/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMotif
+#elif defined(__WXQT__)
+    #include "wx/qt/toplevel.h"
+#define wxTopLevelWindowNative wxTopLevelWindowQt
 #endif
 
 #ifdef __WXUNIVERSAL__
diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 05069c278a..94fff8add4 100644
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -466,6 +466,8 @@ private:
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectlg.h"
+#elif defined(__WXQT__)
+    #include "wx/generic/treectlg.h"
 #endif
 
 #endif // wxUSE_TREECTRL
diff --git a/include/wx/unix/apptbase.h b/include/wx/unix/apptbase.h
index 6ce6f152c3..ff41981407 100644
--- a/include/wx/unix/apptbase.h
+++ b/include/wx/unix/apptbase.h
@@ -48,7 +48,7 @@ public:
     virtual wxFDIOManager *GetFDIOManager();
 #endif // wxUSE_SOCKETS
 
-#if wxUSE_CONSOLE_EVENTLOOP
+#if wxUSE_EVENTLOOP_SOURCE
     // Return a non-NULL pointer to the object responsible for managing the
     // event loop sources in this kind of application.
     virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 6d6144a13b..c60fce171c 100644
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -35,7 +35,7 @@ public:
 // TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
 //       no advantage in doing this compared to the generic way currently used
 //       by wxX11, should we continue to use GTK/Motif-specific stuff?
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXQT__)
     #define wxHAS_GUI_FDIOMANAGER
     #define wxHAS_GUI_PROCESS_CALLBACKS
 #endif // ports using wxFDIOManager
@@ -85,7 +85,9 @@ public:
 
 #endif // wxUSE_SOCKETS
 
+#if wxUSE_EVENTLOOP_SOURCE
     virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() wxOVERRIDE;
+#endif
 };
 
 #endif // wxUSE_GUI
diff --git a/include/wx/window.h b/include/wx/window.h
index b95f15f477..128d35de0e 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1915,6 +1915,13 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
         #define wxWindowMac wxWindow
     #endif // wxUniv
     #include "wx/osx/window.h"
+#elif defined(__WXQT__)
+    #ifdef __WXUNIVERSAL__
+        #define wxWindowNative wxWindowQt
+    #else // !wxUniv
+        #define wxWindowQt wxWindow
+    #endif // wxUniv
+    #include "wx/qt/window.h"
 #endif
 
 // for wxUniversal, we now derive the real wxWindow from wxWindow<platform>,
diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 77c1fb76b0..cabd03ddd4 100644
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -626,7 +626,16 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
     #define wxCRT_ToupperW(c)   towupper((wxUChar)(wxChar)(c))
 #endif /* __GLIBC__/!__GLIBC__ */
 
+/* The Android platform, as of 2014, only support most wide-char function with
+   the exception of multi-byte encoding/decoding functions & wsprintf/wsscanf
+   See android-ndk-r9d/docs/STANDALONE-TOOLCHAIN.html (section 7.2)
+   In fact, mbstowcs/wcstombs are defined and compile, but don't work correctly
+*/
 
+#if defined(__WXQT__) && defined(__ANDROID__)
+    #define wxNEED_WX_MBSTOWCS
+    #undef HAVE_WCSRTOMBS
+#endif
 
 
 
diff --git a/interface/wx/gauge.h b/interface/wx/gauge.h
index 1d3b593478..71879d9ab2 100644
--- a/interface/wx/gauge.h
+++ b/interface/wx/gauge.h
@@ -15,6 +15,8 @@
 
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
+// QT only, display current completed percentage (text default format "%p%")
+#define wxGA_TEXT            0x0040
 
 /**
     @class wxGauge
@@ -43,6 +45,10 @@
     @style{wxGA_SMOOTH}
            Creates smooth progress bar with one pixel wide update step (not
            supported by all platforms).
+    @style{wxGA_TEXT}
+           Display current completed percentage: text default format "%p%"
+           (only supported in wxQt, may be not available on all platforms).
+           @since 3.1.0
     @endStyleTable
 
     @library{wxcore}
diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index 9a0b6d6993..989fc982e0 100644
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -514,7 +514,7 @@ public:
         Constructs a wxMenu object.
 
         @param style
-            If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK only).
+            If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK and wxQT only).
     */
     wxMenu(long style);
 
@@ -524,7 +524,7 @@ public:
         @param title
             Title at the top of the menu (not always supported).
         @param style
-            If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK only).
+            If set to wxMENU_TEAROFF, the menu will be detachable (wxGTK and wxQT only).
     */
     wxMenu(const wxString& title, long style = 0);
 
diff --git a/interface/wx/radiobox.h b/interface/wx/radiobox.h
index c6c1c2cdea..7f0fa4ea03 100644
--- a/interface/wx/radiobox.h
+++ b/interface/wx/radiobox.h
@@ -236,7 +236,7 @@ public:
         Returns @true if the item is enabled or @false if it was disabled using
         @ref Enable(unsigned int,bool) "Enable(n, false)".
 
-        This function is currently only implemented in wxMSW, wxGTK and
+        This function is currently only implemented in wxMSW, wxGTK, wxQT and
         wxUniversal and always returns @true in the other ports.
 
         @param n
@@ -251,7 +251,7 @@ public:
         Note that this function returns @true for an item which hadn't been hidden
         even if the entire radiobox is not currently shown.
 
-        This function is currently only implemented in wxMSW, wxGTK and
+        This function is currently only implemented in wxMSW, wxGTK, wxQT and
         wxUniversal and always returns @true in the other ports.
 
         @param n
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 9023f6120a..361548dbd3 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ACCESSTEST_OBJECTS =  \
 	$(__accesstest___win32rc) \
 	accesstest_accesstest.o
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 41f604139e..13c257de1a 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ANITEST_OBJECTS =  \
 	anitest_anitest.o \
 	$(__anitest___win32rc)
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 06dab68aa1..cf01dea2f8 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ARTTEST_OBJECTS =  \
 	$(__arttest___win32rc) \
 	arttest_arttest.o \
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 2918670fd6..0381160b9f 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -37,6 +37,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -48,7 +49,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 AUIDEMO_OBJECTS =  \
 	$(__auidemo___win32rc) \
 	auidemo_auidemo.o
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 8dd187420d..cc68376340 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CALENDAR_OBJECTS =  \
 	$(__calendar___win32rc) \
 	calendar_calendar.o
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 6c5171530b..0bf5a650fe 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CARET_OBJECTS =  \
 	$(__caret___win32rc) \
 	caret_caret.o
diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index b44f1a32be..eb7a135dfb 100644
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CLIPBOARD_OBJECTS =  \
 	$(__clipboard___win32rc) \
 	clipboard_clipboard.o
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index da1320947e..f202cc022a 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 COLLPANE_OBJECTS =  \
 	collpane_collpane.o \
 	$(__collpane___win32rc)
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index f5f41d97f7..0cb9c451d6 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 COMBO_OBJECTS =  \
 	$(__combo___win32rc) \
 	combo_combo.o
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index b6afe84353..830fda81d5 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CONFTEST_OBJECTS =  \
 	$(__conftest___win32rc) \
 	conftest_conftest.o
diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 9f9b5ed61b..390fbad82c 100644
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -31,6 +31,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -40,8 +41,8 @@ WX_RELEASE = 3.1
 LIBDIRNAME = $(wx_top_builddir)/lib
 CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
-	$(CXXFLAGS)
+	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
 CONSOLE_OBJECTS =  \
 	console_console.o
 
diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 7ce88b9f35..93e8a1dc90 100644
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CONTROLS_OBJECTS =  \
 	controls_controls.o \
 	$(__controls___win32rc)
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index fc2fc53ff0..3c2765abc2 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -106,6 +106,8 @@ public:
     void OnSpinUp( wxSpinEvent &event );
     void OnSpinDown( wxSpinEvent &event );
     void OnSpinUpdate( wxSpinEvent &event );
+    void OnSpinTextChanged(wxCommandEvent& event);
+    void OnSpinTextEnter(wxCommandEvent& WXUNUSED(event));
 #if wxUSE_PROGRESSDLG
     void OnUpdateShowProgress( wxUpdateUIEvent& event );
     void OnShowProgress( wxCommandEvent &event );
@@ -121,13 +123,14 @@ public:
 
     void OnEnableAll(wxCommandEvent& event);
     void OnChangeColour(wxCommandEvent& event);
+    void OnChangeCheck(wxCommandEvent& event);
     void OnTestButton(wxCommandEvent& event);
     void OnBmpButton(wxCommandEvent& event);
     void OnBmpButtonToggle(wxCommandEvent& event);
 
     void OnSizerCheck (wxCommandEvent &event);
 
-    wxListBox     *m_listbox,
+    wxCheckListBox     *m_listbox,
                   *m_listboxSorted;
 #if wxUSE_CHOICE
     wxChoice      *m_choice,
@@ -367,7 +370,7 @@ private:
 // other
 //----------------------------------------------------------------------
 
-static void SetListboxClientData(const wxChar *name, wxListBox *control);
+static void SetListboxClientData(const wxChar *name, wxCheckListBox *control);
 
 #if wxUSE_CHOICE
 static void SetChoiceClientData(const wxChar *name, wxChoice *control);
@@ -502,6 +505,8 @@ const int  ID_SIZER_CHECK14     = 205;
 const int  ID_SIZER_CHECKBIG    = 206;
 
 const int  ID_HYPERLINK         = 300;
+const int  ID_SPIN_TEXT         = 301;
+const int  ID_CHANGE_CHECK      = 302;
 
 wxBEGIN_EVENT_TABLE(MyPanel, wxPanel)
 EVT_IDLE      (                         MyPanel::OnIdle)
@@ -555,6 +560,8 @@ EVT_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)
 EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)
 EVT_SPIN_UP   (ID_SPIN,                 MyPanel::OnSpinUp)
 EVT_SPIN_DOWN (ID_SPIN,                 MyPanel::OnSpinDown)
+EVT_TEXT      (ID_SPIN_TEXT,            MyPanel::OnSpinTextChanged)
+EVT_TEXT_ENTER(ID_SPIN_TEXT,            MyPanel::OnSpinTextEnter)
 #if wxUSE_PROGRESSDLG
 EVT_UPDATE_UI (ID_BTNPROGRESS,          MyPanel::OnUpdateShowProgress)
 EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
@@ -569,6 +576,7 @@ EVT_TEXT      (ID_SPINCTRL,             MyPanel::OnSpinCtrlText)
 EVT_BUTTON    (ID_BTNNEWTEXT,           MyPanel::OnNewText)
 EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
 EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)
+EVT_CHECKBOX  (ID_CHANGE_CHECK,         MyPanel::OnChangeCheck)
 EVT_BUTTON    (ID_BUTTON_TEST1,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BUTTON_TEST2,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BITMAP_BTN,           MyPanel::OnBmpButton)
@@ -650,6 +658,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
+    // use default position and size (will be recalculated automatically)
     m_book = new wxBookCtrl(this, ID_BOOK);
 
     wxString choices[] =
@@ -735,10 +744,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     // listbox page
     // ------------------------------------------------------------------------
     wxPanel *panel = new wxPanel(m_book);
-    m_listbox = new wxListBox( panel, ID_LISTBOX,
+    m_listbox = new wxCheckListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),
                                5, choices, wxLB_MULTIPLE | wxLB_ALWAYS_SB | wxHSCROLL );
-    m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED,
+    m_listboxSorted = new wxCheckListBox( panel, ID_LISTBOX_SORTED,
                                      wxPoint(10,90), wxSize(120,70),
                                      3, choices, wxLB_SORT );
 
@@ -761,8 +770,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     button->MoveAfterInTabOrder(m_checkbox);
     (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, wxT("&Toggle colour"),
                           wxPoint(110,170) );
+    (void)new wxCheckBox( panel, ID_CHANGE_CHECK, wxT("&Toggle check"),
+                          wxPoint(270,170) );
     panel->SetCursor(wxCursor(wxCURSOR_HAND));
-    m_book->AddPage(panel, wxT("wxListBox"), true, Image_List);
+    m_book->AddPage(panel, wxT("wxCheckListBox"), true);
+    m_book->SetPageImage(0, Image_List);
+    wxASSERT_MSG(m_book->GetPageImage(m_book->GetPageCount()-1) == Image_List, "invalid imageId");
+    //m_book->SetPageImage(0, -1);  // remove the image to test wxQT
+    //m_book->RemovePage(0);  // remove the page to test wxQT
+
 
     // ------------------------------------------------------------------------
     // choice page
@@ -786,6 +802,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
 
     m_book->AddPage(panel, wxT("wxChoice"), false, Image_Choice);
+    wxASSERT_MSG(m_book->GetPageImage(m_book->GetPageCount()-1) == Image_Choice, "invalid imageId");
+
 #endif // wxUSE_CHOICE
 
     // ------------------------------------------------------------------------
@@ -796,10 +814,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                               wxPoint(15,25), wxDefaultSize,
                               5, choices,
                               wxTE_PROCESS_ENTER);
+
+    wxASSERT_MSG(!m_combo->GetString(2).IsNull(), "Invalid item not null");
+
     wxSize combosize(m_combo->GetBestSize().x + 20, 100);
     (void)new wxStaticBox( panel, wxID_ANY, wxT("&Box around combobox"),
                            wxPoint(5, 5), combosize);
-
+#ifdef __WXQT__
+    m_combo->Raise();
+#endif
     (void)new wxButton( panel, ID_COMBO_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) );
@@ -809,6 +832,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxButton( panel, ID_COMBO_SET_TEXT, wxT("Set 'Hi!' at #2"), wxPoint(380,180), wxSize(140,30) );
     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
     m_book->AddPage(panel, wxT("wxComboBox"), false, Image_Combo);
+    wxASSERT_MSG(m_book->GetPageImage(m_book->GetPageCount()-1) == Image_Combo, "invalid imageId");
 
     // ------------------------------------------------------------------------
     // radio box
@@ -885,7 +909,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     gauge_page_first_row_sizer->Add( gauge_sizer, 0, wxALL, 5 );
     wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL );
     gauge_sizer->Add( sz );
-    m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
+    m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER|wxGA_TEXT );
     sz->Add( m_gauge, 0, wxALL, 10 );
     m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200,
                              wxDefaultPosition, wxSize(155,wxDefaultCoord),
@@ -943,7 +967,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;
-    m_spintext = new wxTextCtrl( panel, wxID_ANY, s );
+    m_spintext = new wxTextCtrl( panel, ID_SPIN_TEXT, s );
     gauge_page_second_row_sizer->Add( m_spintext, 0, wxALL, 5 );
 
 #if wxUSE_SPINBTN
@@ -957,6 +981,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString );
     m_spinctrl->SetRange(-10,30);
     m_spinctrl->SetValue(15);
+    m_spinctrl->SetValue("20");
     gauge_page_second_row_sizer->Add( m_spinctrl, 0, wxALL, 5 );
 #endif // wxUSE_SPINCTRL
 
@@ -994,7 +1019,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     wxBitmap bitmap( 100, 100 );
     wxMemoryDC dc;
+    wxFont font;
+    font.SetFamily(wxFONTFAMILY_ROMAN);
+    font.SetPointSize(10);
     dc.SelectObject( bitmap );
+    dc.SetFont(font);
     dc.SetBackground(*wxGREEN);
     dc.SetPen(*wxRED_PEN);
     dc.Clear();
@@ -1260,9 +1289,17 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
     Refresh();
 }
 
+void MyPanel::OnChangeCheck(wxCommandEvent& event)
+{
+    // check/uncheck all the items in the wxCheckListBox
+    for (unsigned int n=0; n < m_listbox->GetCount(); n++) {
+        m_listbox->Check(n, event.GetInt());
+    }
+}
+
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
-    wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
+    wxCheckListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
                                                      : m_listboxSorted;
 
     bool deselect = false;
@@ -1301,6 +1338,11 @@ void MyPanel::OnListBox( wxCommandEvent &event )
     else
         m_text->AppendText( wxString(wxT("none")) );
     m_text->AppendText( wxT("'\n") );
+
+    if (listbox->IsChecked(event.GetInt()))
+        m_text->AppendText( "Item checked \n" );
+    else
+        m_text->AppendText( "Item unchecked \n" );
 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
@@ -1690,7 +1732,8 @@ void MyPanel::OnSpinUpdate( wxSpinEvent &event )
 {
     wxString value;
     value.Printf( wxT("%d"), event.GetPosition() );
-    m_spintext->SetValue( value );
+    // update the value of the text control without sending an event
+    m_spintext->ChangeValue( value );
 
     value.Printf( wxT("Spin control range: (%d, %d), current = %d\n"),
                  m_spinbutton->GetMin(), m_spinbutton->GetMax(),
@@ -1699,6 +1742,25 @@ void MyPanel::OnSpinUpdate( wxSpinEvent &event )
     m_text->AppendText(value);
 }
 
+void MyPanel::OnSpinTextChanged(wxCommandEvent& event)
+{
+    if (m_spintext)
+    {
+        wxLogMessage(wxT("EVT_TEXT for the spin text: \"%s\" (event) or \"%s\" (control)."),
+                     event.GetString().c_str(),
+                     m_spintext->GetValue().c_str());
+    }
+}
+
+void MyPanel::OnSpinTextEnter(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_spintext)
+    {
+        wxLogMessage(wxT("Enter pressed in the spin text: value is '%s'."),
+                     m_spintext->GetValue().c_str());
+    }
+}
+
 void MyPanel::OnNewText( wxCommandEvent& /* event */)
 {
     m_nonWrappingText->SetLabel( wxT("This text is short\nbut still spans\nover three lines.") );
@@ -2108,7 +2170,7 @@ void MyComboBox::OnKeyUp(wxKeyEvent& event)
     event.Skip();
 }
 
-static void SetListboxClientData(const wxChar *name, wxListBox *control)
+static void SetListboxClientData(const wxChar *name, wxCheckListBox *control)
 {
     size_t count = control->GetCount();
     for ( size_t n = 0; n < count; n++ )
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 01f9706238..fc6288284e 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DATAVIEW_OBJECTS =  \
 	dataview_dataview.o \
 	dataview_mymodels.o \
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index 61e4cec190..8fce1c0916 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DEBUGRPT_OBJECTS =  \
 	$(__debugrpt___win32rc) \
 	debugrpt_debugrpt.o
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 7471c44413..8c7d579748 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
 	$(__dialogs___win32rc) \
 	dialogs_dialogs.o \
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 2fe754cc6c..50e5a07066 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 NETTEST_OBJECTS =  \
 	$(__nettest___win32rc) \
 	nettest_nettest.o
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 670386c97b..d40a145a85 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DISPLAY_OBJECTS =  \
 	$(__display___win32rc) \
 	display_display.o
diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index 24ce8af8b3..0f535665ea 100644
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -41,6 +41,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -58,7 +59,7 @@ MY_DLL_OBJECTS =  \
 WX_EXE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WX_EXE_OBJECTS =  \
 	$(__wx_exe___win32rc) \
 	wx_exe_wx_exe.o
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 36863f5f4d..eab03eb982 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DND_OBJECTS =  \
 	dnd_dnd.o \
 	$(__dnd___win32rc)
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 0ee563a82f..629fdf2b93 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DOCVIEW_OBJECTS =  \
 	docview_docview.o \
 	docview_doc.o \
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index 9a20d92869..08fbed0e57 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DRAGIMAG_OBJECTS =  \
 	dragimag_dragimag.o \
 	$(__dragimag___win32rc)
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index dae3f7e4a0..874af30ae7 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 DRAWING_OBJECTS =  \
 	$(__drawing___win32rc) \
 	drawing_drawing.o
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index f343e405f5..ea25733d33 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ERASE_OBJECTS =  \
 	$(__erase___win32rc) \
 	erase_erase.o
diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index cacf663f01..31a47bb6ce 100644
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -349,8 +349,8 @@ MyCanvas::MyCanvas(wxFrame *parent)
     new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
 
     new wxStaticText(this, wxID_ANY,
-                     "Left bitmap is a wxStaticBitmap,\n"
-                     "right one drawn directly",
+                     "Right bitmap is a wxStaticBitmap,\n"
+                     "left one drawn directly",
                      wxPoint(150, 20));
 
     new ControlWithTransparency(this, wxPoint(65, 125), wxSize(350, 22));
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 68315918da..d5266ed33a 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 EVENT_OBJECTS =  \
 	$(__event___win32rc) \
 	event_event.o
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index 1ff426cf06..da237a4919 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 EXCEPT_OBJECTS =  \
 	$(__except___win32rc) \
 	except_except.o
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index 51ef928463..a24684860f 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 EXEC_OBJECTS =  \
 	$(__exec___win32rc) \
 	exec_exec.o
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 53fb956109..e1a24756ef 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 FONT_OBJECTS =  \
 	$(__font___win32rc) \
 	font_font.o
diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in
index 5678b09a2d..95ab22693c 100644
--- a/samples/fswatcher/Makefile.in
+++ b/samples/fswatcher/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 FSWATCHER_OBJECTS =  \
 	$(__fswatcher___win32rc) \
 	fswatcher_fswatcher.o
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 92ea9d1db0..7ba7d94991 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 GRID_OBJECTS =  \
 	$(__grid___win32rc) \
 	grid_griddemo.o
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 54b2074bd7..01d26f3e3e 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -37,6 +37,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -48,7 +49,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 HELP_OBJECTS =  \
 	$(__help___win32rc) \
 	help_demo.o
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index f9dc10e2c3..31c235ce85 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 HTLBOX_OBJECTS =  \
 	$(__htlbox___win32rc) \
 	htlbox_htlbox.o
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 618cdc5315..d927b0dfb4 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ABOUT_OBJECTS =  \
 	$(__about___win32rc) \
 	about_about.o
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index b2ef62e144..fc9586ea4e 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,8 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
 HTMLHELP_OBJECTS =  \
 	$(__htmlhelp___win32rc) \
 	htmlhelp_help.o
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 853f28ea47..603915e7e7 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,8 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
 HELPVIEW_OBJECTS =  \
 	$(__helpview___win32rc) \
 	helpview_helpview.o
diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index 766efda00e..a5c25defdb 100644
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,8 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
 HTMLCTRL_OBJECTS =  \
 	$(__htmlctrl___win32rc) \
 	htmlctrl_htmlctrl.o
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 4fd1d2cfb0..55058c77b3 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,8 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir)/../../../samples $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
 HTMLPRINTING_OBJECTS =  \
 	$(__htmlprinting___win32rc) \
 	htmlprinting_printing.o
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index b8bd573669..b05edfbd29 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	$(__test___win32rc) \
 	test_test.o
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 2d5d5baed9..173294db86 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 VIRTUAL_OBJECTS =  \
 	$(__virtual___win32rc) \
 	virtual_virtual.o
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 2c653d12cd..5db8140fc6 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WIDGET_OBJECTS =  \
 	$(__widget___win32rc) \
 	widget_widget.o
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 0cea013d66..437a72007f 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ZIP_OBJECTS =  \
 	$(__zip___win32rc) \
 	zip_zip.o
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 32030f3853..a4ee7cb5e6 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
 	image_image.o \
 	image_canvas.o \
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 10aca3b80e..9c1b6e9249 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 INTERNAT_OBJECTS =  \
 	$(__internat___win32rc) \
 	internat_internat.o
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index a15f191e94..f44bb3fc6d 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,27 +47,27 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 IPCCLIENT_OBJECTS =  \
 	$(__ipcclient___win32rc) \
 	ipcclient_client.o
 IPCSERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 IPCSERVER_OBJECTS =  \
 	$(__ipcserver___win32rc) \
 	ipcserver_server.o
 BASEIPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 BASEIPCCLIENT_OBJECTS =  \
 	baseipcclient_baseclient.o
 BASEIPCSERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 BASEIPCSERVER_OBJECTS =  \
 	baseipcserver_baseserver.o
 
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 251eed4d9c..708ddbe422 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 JOYTEST_OBJECTS =  \
 	$(__joytest___win32rc) \
 	joytest_joytest.o
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 47c6f7648b..0b1f0f99ba 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 KEYBOARD_OBJECTS =  \
 	$(__keyboard___win32rc) \
 	keyboard_keyboard.o
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index d2f28c5a5c..d2e7dc324c 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 LAYOUT_OBJECTS =  \
 	$(__layout___win32rc) \
 	layout_layout.o
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index a6a103737c..753876840e 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 LISTCTRL_OBJECTS =  \
 	listctrl_listtest.o \
 	$(__listctrl___win32rc)
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index fde77cc6aa..d70720779d 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MDI_OBJECTS =  \
 	mdi_mdi.o \
 	$(__mdi___win32rc)
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 44277e949e..6545476e30 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MEDIAPLAYER_OBJECTS =  \
 	$(__mediaplayer___win32rc) \
 	mediaplayer_mediaplayer.o
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index fde27e0abf..283274d636 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MEMCHECK_OBJECTS =  \
 	$(__memcheck___win32rc) \
 	memcheck_memcheck.o
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 5c66023080..c95ced3c7b 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MENU_OBJECTS =  \
 	$(__menu___win32rc) \
 	menu_menu.o
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index d9aa772d31..57580cc098 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MINIMAL_OBJECTS =  \
 	$(__minimal___win32rc) \
 	minimal_minimal.o
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 728d232590..1198474708 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 NATIVDLG_OBJECTS =  \
 	nativdlg_nativdlg.o \
 	$(__nativdlg___win32rc)
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index a62eb2a16d..090a46507b 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 NOTEBOOK_OBJECTS =  \
 	$(__notebook___win32rc) \
 	notebook_notebook.o
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 490a8b1306..51508f502b 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 OLEAUTO_OBJECTS =  \
 	$(__oleauto___win32rc) \
 	oleauto_oleauto.o
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index e3abe2f546..8e4965db18 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CUBE_OBJECTS =  \
 	$(__cube___win32rc) \
 	cube_cube.o
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index 2c39025162..e9b6ca84f9 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 ISOSURF_OBJECTS =  \
 	$(__isosurf___win32rc) \
 	isosurf_isosurf.o
diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 9cad6b0d35..2511e9a4a0 100644
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -118,7 +118,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
         { WX_GL_RGBA, WX_GL_MIN_RED, 1, WX_GL_MIN_GREEN, 1,
         WX_GL_MIN_BLUE, 1, WX_GL_DEPTH_SIZE, 1,
         WX_GL_DOUBLEBUFFER,
-#  if defined(__WXMAC__)
+#  if defined(__WXMAC__)  || defined(__WXQT__)
         GL_NONE };
 #  else
         None };
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 9c3e6d89ca..daaed9b092 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -38,6 +38,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -53,7 +54,7 @@ PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 PENGUIN_OBJECTS =  \
 	$(__penguin___win32rc) \
 	penguin_penguin.o \
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index c753832589..65ae1c5587 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 OWNERDRW_OBJECTS =  \
 	ownerdrw_ownerdrw.o \
 	$(__ownerdrw___win32rc)
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index a8bc230d7e..b8e257b5be 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 POPUP_OBJECTS =  \
 	popup_popup.o \
 	$(__popup___win32rc)
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index edfe518089..02d92c32b8 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 POWER_OBJECTS =  \
 	$(__power___win32rc) \
 	power_power.o
diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in
index c8c68ea97f..d2b94005a6 100644
--- a/samples/preferences/Makefile.in
+++ b/samples/preferences/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 PREFERENCES_OBJECTS =  \
 	$(__preferences___win32rc) \
 	preferences_preferences.o
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index f74f352e04..856d359021 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 PRINTING_OBJECTS =  \
 	$(__printing___win32rc) \
 	printing_printing.o
diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index 5cf63c8865..effb7f9b61 100644
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 PROPGRID_OBJECTS =  \
 	propgrid_propgrid.o \
 	propgrid_propgrid_minimal.o \
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index fb7d00aac1..ffe00a9d14 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 REGTEST_OBJECTS =  \
 	regtest_regtest.o \
 	$(__regtest___win32rc)
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 9cec5b3b1d..54d675b370 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -43,6 +43,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -57,7 +58,7 @@ PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
 RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 RENDER_OBJECTS =  \
 	$(__render___win32rc) \
 	render_render.o
diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in
index f6dfa791cb..af737bbb2d 100644
--- a/samples/ribbon/Makefile.in
+++ b/samples/ribbon/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 RIBBON_OBJECTS =  \
 	ribbon_ribbondemo.o \
 	$(__ribbon___win32rc)
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index 3de4e313bf..70a2839edb 100644
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -37,6 +37,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -48,7 +49,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXT_OBJECTS =  \
 	richtext_richtext.o \
 	$(__richtext___win32rc)
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 20b8b6aa0e..c9c0dc9a4f 100644
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SASHTEST_OBJECTS =  \
 	sashtest_sashtest.o \
 	$(__sashtest___win32rc)
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 35b6506ca1..25789e8573 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SCROLL_OBJECTS =  \
 	$(__scroll___win32rc) \
 	scroll_scroll.o
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 75ce9c2053..a049daaa67 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SHAPED_OBJECTS =  \
 	$(__shaped___win32rc) \
 	shaped_shaped.o
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 3188909278..9b4c4bdcf9 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,27 +47,27 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \
 	$(__client___win32rc) \
 	client_client.o
 SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SERVER_OBJECTS =  \
 	$(__server___win32rc) \
 	server_server.o
 BASECLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 BASECLIENT_OBJECTS =  \
 	baseclient_baseclient.o
 BASESERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 BASESERVER_OBJECTS =  \
 	baseserver_baseserver.o
 
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 873181cd61..47c79c6ab9 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SOUND_OBJECTS =  \
 	sound_sound.o \
 	$(__sound___win32rc)
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 839e0a396f..3082a53a7b 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -37,6 +37,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -48,7 +49,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SPLASH_OBJECTS =  \
 	splash_splash.o \
 	$(__splash___win32rc)
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 8feff92b6a..5bf4f2133d 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SPLITTER_OBJECTS =  \
 	$(__splitter___win32rc) \
 	splitter_splitter.o
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 0a4033a700..868328395d 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 STATBAR_OBJECTS =  \
 	$(__statbar___win32rc) \
 	statbar_statbar.o
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index 4fce1b6f63..8d9662e455 100644
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 STCTEST_OBJECTS =  \
 	$(__stctest___win32rc) \
 	stctest_stctest.o \
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 21cf52f88d..da3135d8e4 100644
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 SVGTEST_OBJECTS =  \
 	$(__svgtest___win32rc) \
 	svgtest_svgtest.o
diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in
index e71f81ec9e..272e148d9a 100644
--- a/samples/taborder/Makefile.in
+++ b/samples/taborder/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TABORDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TABORDER_OBJECTS =  \
 	$(__taborder___win32rc) \
 	taborder_taborder.o
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index b920404a8c..29c85af391 100644
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TASKBAR_OBJECTS =  \
 	$(__taskbar___win32rc) \
 	taskbar_tbtest.o
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index 2002e2f142..0f61096368 100644
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TEXT_OBJECTS =  \
 	$(__text___win32rc) \
 	text_text.o
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 7a070d53f6..0bb6f58016 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 THREAD_OBJECTS =  \
 	$(__thread___win32rc) \
 	thread_thread.o
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 47102e42fa..bb8dc0073b 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TOOLBAR_OBJECTS =  \
 	toolbar_toolbar.o \
 	$(__toolbar___win32rc)
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index 8a2387be9c..77dacb62a5 100644
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TREECTRL_OBJECTS =  \
 	treectrl_treetest.o \
 	$(__treectrl___win32rc)
diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in
index 68647ea40a..56c25a4556 100644
--- a/samples/treelist/Makefile.in
+++ b/samples/treelist/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TREELIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TREELIST_OBJECTS =  \
 	$(__treelist___win32rc) \
 	treelist_treelist.o
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 6f292f08d1..1c5c1bee94 100644
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TYPETEST_OBJECTS =  \
 	$(__typetest___win32rc) \
 	typetest_typetest.o
diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in
index 82d1d372f2..3a015d8324 100644
--- a/samples/uiaction/Makefile.in
+++ b/samples/uiaction/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 UIACTION_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 UIACTION_OBJECTS =  \
 	$(__uiaction___win32rc) \
 	uiaction_uiaction.o
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index ca76888a91..abfe50dc76 100644
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 VALIDATE_OBJECTS =  \
 	validate_validate.o \
 	$(__validate___win32rc)
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 4e3ab0105c..655dca452c 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 VSTEST_OBJECTS =  \
 	$(__vstest___win32rc) \
 	vstest_vstest.o
diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in
index ed2392b8de..710b4b71eb 100644
--- a/samples/webview/Makefile.in
+++ b/samples/webview/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WEBVIEW_OBJECTS =  \
 	webview_webview.o \
 	$(__webview___win32rc)
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index e76078b61b..7e56e3d870 100644
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
 	widgets_bmpcombobox.o \
 	widgets_button.o \
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 02882f364f..8a3f98d963 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -36,6 +36,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WIZARD_OBJECTS =  \
 	$(__wizard___win32rc) \
 	wizard_wizard.o
diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index a164e535fa..83c873138c 100644
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 WRAPSIZER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 WRAPSIZER_OBJECTS =  \
 	$(__wrapsizer___win32rc) \
 	wrapsizer_wrapsizer.o
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 06542df69d..9f3b8d215a 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -37,6 +37,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -48,7 +49,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 XRCDEMO_OBJECTS =  \
 	$(__xrcdemo___win32rc) \
 	xrcdemo_xrcdemo.o \
diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in
index bca8ac3347..3a66bc895a 100644
--- a/samples/xti/Makefile.in
+++ b/samples/xti/Makefile.in
@@ -35,6 +35,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -46,7 +47,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 XTI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 XTI_OBJECTS =  \
 	$(__xti___win32rc) \
 	xti_xti.o \
diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index a92b960f9d..1a49f500e4 100644
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -178,7 +178,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
 // wxBitmap common
 // ----------------------------------------------------------------------------
 
-#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
+#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXQT__))
 
 wxBitmap::wxBitmap(const char* const* bits)
 {
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index c679ab80c7..0967630655 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -81,6 +81,11 @@
     #include "wx/dfb/dcscreen.h"
 #endif
 
+#ifdef __WXQT__
+    #include "wx/qt/dcclient.h"
+    #include "wx/qt/dcmemory.h"
+    #include "wx/qt/dcscreen.h"
+#endif
 //----------------------------------------------------------------------------
 // wxDCFactory
 //----------------------------------------------------------------------------
diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 9d29048a78..827989f3e5 100644
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -24,7 +24,6 @@
 #include "wx/scopeguard.h"
 #include "wx/apptrait.h"
 #include "wx/private/eventloopsourcesmanager.h"
-
 // ----------------------------------------------------------------------------
 // wxEventLoopBase
 // ----------------------------------------------------------------------------
@@ -35,7 +34,6 @@ wxEventLoopBase::wxEventLoopBase()
 {
     m_isInsideRun = false;
     m_shouldExit = false;
-
     m_isInsideYield = false;
     m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
 }
@@ -84,7 +82,6 @@ void wxEventLoopBase::Exit(int rc)
 
     ScheduleExit(rc);
 }
-
 void wxEventLoopBase::OnExit()
 {
     if (wxTheApp)
@@ -179,7 +176,6 @@ wxEventLoopBase::AddSourceForFD(int fd,
 }
 
 #endif // wxUSE_EVENTLOOP_SOURCE
-
 // wxEventLoopManual is unused in the other ports
 #if defined(__WINDOWS__) || defined(__WXDFB__) || ( ( defined(__UNIX__) && !defined(__WXOSX__) ) && wxUSE_BASE)
 
@@ -211,12 +207,12 @@ bool wxEventLoopManual::ProcessEvents()
         if ( m_shouldExit )
             return false;
     }
-
     return Dispatch();
 }
 
 int wxEventLoopManual::DoRun()
 {
+
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside ProcessEvents() but we must call it from Exit() in normal
     // situations because it is supposed to be called synchronously,
@@ -241,6 +237,7 @@ int wxEventLoopManual::DoRun()
                     ;
 
                 if ( m_shouldExit )
+
                     break;
 
                 // a message came or no more idle processing to do, dispatch
@@ -279,7 +276,6 @@ int wxEventLoopManual::DoRun()
                 if ( !hasMoreEvents )
                     break;
             }
-
 #if wxUSE_EXCEPTIONS
             // exit the outer loop as well
             break;
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 53b2f941d9..411680e30e 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1713,6 +1713,8 @@ wxString GetDateFormatFromLangInfo(wxLocaleInfo index)
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
 {
+// TODO: as of 2014 Android doesn't has complete locale support (use java api)
+#if !(defined(__WXQT__) && defined(__ANDROID__))
     lconv * const lc = localeconv();
     if ( !lc )
         return wxString();
@@ -1754,7 +1756,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
         default:
             wxFAIL_MSG( "unknown wxLocaleInfo value" );
     }
-
+#endif
     return wxString();
 }
 
diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp
index e6101be4c3..a8c01f9466 100644
--- a/src/common/listctrlcmn.cpp
+++ b/src/common/listctrlcmn.cpp
@@ -103,7 +103,7 @@ wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
 wxFLAGS_MEMBER(wxLC_VIRTUAL)
 wxEND_FLAGS( wxListCtrlStyle )
 
-#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
+#if ((!defined(__WXMSW__) && !defined(__WXQT__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxGenericListCtrl, "wx/listctrl.h")
 #else
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h")
diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp
index ee943915c6..268d51273e 100644
--- a/src/common/platinfo.cpp
+++ b/src/common/platinfo.cpp
@@ -66,6 +66,7 @@ static const wxChar* const wxOperatingSystemIdNames[] =
 
     wxT("DOS"),
     wxT("OS/2"),
+
 };
 
 static const wxChar* const wxPortIdNames[] =
@@ -80,6 +81,7 @@ static const wxChar* const wxPortIdNames[] =
     wxT("wxMac"),
     wxT("wxCocoa"),
     wxT("wxWinCE"),
+    wxT("wxQT")
 };
 
 static const wxChar* const wxArchitectureNames[] =
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 0009241506..1a5dcb1245 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -58,6 +58,9 @@
 #include "wx/osx/printdlg.h"
 #include "wx/osx/private/print.h"
 #include "wx/osx/dcprint.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dcprint.h"
+#include "wx/qt/printdlg.h"
 #else
 #include "wx/generic/prntdlgg.h"
 #include "wx/dcps.h"
@@ -101,6 +104,8 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
     return new wxWindowsPrinter( data );
 #elif defined(__WXMAC__)
     return new wxMacPrinter( data );
+#elif defined(__WXQT__)
+    return new wxQtPrinter( data );
 #else
     return new wxPostScriptPrinter( data );
 #endif
@@ -113,6 +118,8 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
     return new wxWindowsPrintPreview( preview, printout, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintPreview( preview, printout, data );
+#elif defined(__WXQT__)
+    return new wxQtPrintPreview( preview, printout, data );
 #else
     return new wxPostScriptPrintPreview( preview, printout, data );
 #endif
@@ -125,6 +132,8 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
     return new wxWindowsPrintPreview( preview, printout, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintPreview( preview, printout, data );
+#elif defined(__WXQT__)
+    return new wxQtPrintPreview( preview, printout, data );
 #else
     return new wxPostScriptPrintPreview( preview, printout, data );
 #endif
@@ -137,6 +146,8 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
     return new wxWindowsPrintDialog( parent, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintDialog( parent, data );
+#elif defined(__WXQT__)
+    return new wxQtPrintDialog( parent, data );
 #else
     return new wxGenericPrintDialog( parent, data );
 #endif
@@ -149,6 +160,8 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
     return new wxWindowsPrintDialog( parent, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintDialog( parent, data );
+#elif defined(__WXQT__)
+    return new wxQtPrintDialog( parent, data );
 #else
     return new wxGenericPrintDialog( parent, data );
 #endif
@@ -161,6 +174,8 @@ wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *pa
     return new wxWindowsPageSetupDialog( parent, data );
 #elif defined(__WXMAC__)
     return new wxMacPageSetupDialog( parent, data );
+#elif defined(__WXQT__)
+    return new wxQtPageSetupDialog( parent, data );
 #else
     return new wxGenericPageSetupDialog( parent, data );
 #endif
@@ -193,6 +208,10 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
     wxUnusedVar(parent);
     wxUnusedVar(data);
     return NULL;
+#elif defined(__WXQT__)
+    wxUnusedVar(parent);
+    wxUnusedVar(data);
+    return NULL;
 #else
     // Only here do we need to provide the print setup
     // dialog ourselves, the other platforms either have
@@ -254,6 +273,8 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
     return new wxWindowsPrintNativeData;
 #elif defined(__WXMAC__)
     return wxOSXCreatePrintData();
+#elif defined(__WXQT__)
+    return  new wxQtPrintNativeData;
 #else
     return new wxPostScriptPrintNativeData;
 #endif
@@ -537,11 +558,9 @@ void wxPrintAbortDialog::SetProgress(int currentPage, int totalPages,
       text += wxString::Format(_(" (copy %d of %d)"), currentCopy, totalCopies);
   m_progress->SetLabel(text);
 }
-
 void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     wxCHECK_RET( wxPrinterBase::sm_abortWindow != NULL, "OnCancel called twice" );
-
     wxPrinterBase::sm_abortIt = true;
     wxPrinterBase::sm_abortWindow->Destroy();
     wxPrinterBase::sm_abortWindow = NULL;
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 4682611a60..8d5ad10203 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -93,6 +93,9 @@
     #include <gtk/gtk.h>    // for GTK_XXX_VERSION constants
 #endif
 
+#if wxUSE_GUI && defined(__WXQT__)
+    #include <QtGlobal>       // for QT_VERSION_STR constants
+#endif
 #if wxUSE_BASE
 
 // ============================================================================
@@ -383,6 +386,10 @@ bool wxPlatform::Is(int platform)
     if (platform == wxOS_UNIX)
         return true;
 #endif
+#ifdef __WXQT__
+    if (platform == wxPORT_QT)
+        return true;
+#endif
 
     if (sm_customPlatforms && sm_customPlatforms->Index(platform) != wxNOT_FOUND)
         return true;
@@ -1424,6 +1431,11 @@ wxVersionInfo wxGetLibraryVersionInfo()
                             GTK_MICRO_VERSION);
 #endif // __WXGTK__
 
+#ifdef __WXQT__
+    msg += wxString::Format("Compile-time QT version is %s.\n",
+                            QT_VERSION_STR);
+#endif // __WXQT__
+
     return wxVersionInfo(wxS("wxWidgets"),
                          wxMAJOR_VERSION,
                          wxMINOR_VERSION,
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 5da6bf3d7b..01b1db1b1d 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -86,6 +86,11 @@ using namespace std;
 #endif
 #endif
 
+#ifdef __WXQT__
+#include <QtGui/QPainter>
+#include "wx/qt/dc.h"
+#endif
+
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
 #include <cairo-quartz.h>
@@ -474,6 +479,12 @@ protected:
 
     void Init(cairo_t *context);
 
+#ifdef __WXQT__
+    QPainter* m_qtPainter;
+    QImage* m_qtImage;
+    cairo_surface_t* m_qtSurface;
+#endif
+
 private:
     cairo_t* m_context;
 
@@ -1735,6 +1746,19 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC&
     Init( cairo_create( surface ) );
     cairo_surface_destroy( surface );
 #endif
+
+#ifdef __WXQT__
+    m_qtPainter = (QPainter*) dc.GetHandle();
+    // create a internal buffer (fallback if cairo_qt_surface is missing)
+    m_qtImage = new QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+    // clear the buffer to be painted over the current contents
+    m_qtImage->fill(Qt::transparent);
+    m_qtSurface = cairo_image_surface_create_for_data(m_qtImage->bits(),
+                                                      CAIRO_FORMAT_ARGB32,
+                                                      width, height,
+                                                      m_qtImage->bytesPerLine());
+    Init( cairo_create( m_qtSurface ) );
+#endif
 }
 
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc )
@@ -1810,6 +1834,19 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
     Init( cairo_create( surface ) );
     cairo_surface_destroy( surface );
 #endif
+
+#ifdef __WXQT__
+    m_qtPainter = NULL;
+    // create a internal buffer (fallback if cairo_qt_surface is missing)
+    m_qtImage = new QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+    // clear the buffer to be painted over the current contents
+    m_qtImage->fill(Qt::transparent);
+    m_qtSurface = cairo_image_surface_create_for_data(m_qtImage->bits(),
+                                                      CAIRO_FORMAT_ARGB32,
+                                                      width, height,
+                                                      m_qtImage->bytesPerLine());
+    Init( cairo_create( m_qtSurface ) );
+#endif
 }
 
 #ifdef __WXGTK20__
@@ -1882,6 +1919,9 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
     Init(cairo_create(m_mswSurface));
 #endif
 
+#ifdef __WXQT__
+    // direct m_qtSurface is not being used yet (this needs cairo qt surface)
+#endif
 }
 
 wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer) :
@@ -1902,6 +1942,17 @@ wxCairoContext::~wxCairoContext()
     if ( m_mswSurface )
         cairo_surface_destroy(m_mswSurface);
 #endif
+#ifdef __WXQT__
+    if ( m_qtPainter != NULL )
+    {
+        // draw the internal buffered image to the widget
+        cairo_surface_flush(m_qtSurface);
+        m_qtPainter->drawImage( 0,0, *m_qtImage );
+        delete m_qtImage;
+        cairo_surface_destroy( m_qtSurface );
+    }
+#endif
+
 }
 
 void wxCairoContext::Init(cairo_t *context)
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 7811533286..6fc8c1dded 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2258,7 +2258,7 @@ void wxGrid::Create()
     // now that we have the grid window, use its font to compute the default
     // row height
     m_defaultRowHeight = m_gridWin->GetCharHeight();
-#if defined(__WXMOTIF__) || defined(__WXGTK__)  // see also text ctrl sizing in ShowCellEditControl()
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__)  // see also text ctrl sizing in ShowCellEditControl()
     m_defaultRowHeight += 8;
 #else
     m_defaultRowHeight += 4;
@@ -5566,11 +5566,12 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
         // size of the rectangle is reduced to compensate for the thickness of
         // the line. If this is too strange on non-wxMSW platforms then
         // please #ifdef this appropriately.
+#ifndef __WXQT__
         rect.x += penWidth / 2;
         rect.y += penWidth / 2;
         rect.width -= penWidth - 1;
         rect.height -= penWidth - 1;
-
+#endif
         // Now draw the rectangle
         // use the cellHighlightColour if the cell is inside a selection, this
         // will ensure the cell is always visible.
@@ -5838,7 +5839,7 @@ wxGrid::DoDrawGridLines(wxDC& dc,
         int i = GetColAt( colPos );
 
         int colRight = GetColRight(i);
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXQT__)
         if (GetLayoutDirection() != wxLayout_RightToLeft)
 #endif
             colRight--;
@@ -6360,6 +6361,7 @@ void wxGrid::ShowCellEditControl()
             if (rect.x < 0)
                 nXMove = rect.x;
 
+#ifndef __WXQT__
             // cell is shifted by one pixel
             // However, don't allow x or y to become negative
             // since the SetSize() method interprets that as
@@ -6368,6 +6370,11 @@ void wxGrid::ShowCellEditControl()
                 rect.x--;
             if (rect.y > 0)
                 rect.y--;
+#else
+            // Substract 1 pixel in every dimension to fit in the cell area.
+            // If not, Qt will draw the control outside the cell.
+            rect.Deflate(1, 1);
+#endif
 
             wxGridCellEditor* editor = attr->GetEditor(this, row, col);
             if ( !editor->IsCreated() )
@@ -6702,12 +6709,14 @@ wxRect wxGrid::CellToRect( int row, int col ) const
         for (i=row; i < row + cell_rows; i++)
             rect.height += GetRowHeight(i);
 
+#ifndef __WXQT__
         // if grid lines are enabled, then the area of the cell is a bit smaller
         if (m_gridLinesEnabled)
         {
             rect.width -= 1;
             rect.height -= 1;
         }
+#endif
     }
 
     return rect;
@@ -7439,7 +7448,7 @@ int wxGrid::GetColSize( int col ) const
 void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
 {
     m_defaultCellAttr->SetBackgroundColour(col);
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXQT__)
     m_gridWin->SetBackgroundColour(col);
 #endif
 }
diff --git a/src/qt/accel.cpp b/src/qt/accel.cpp
new file mode 100644
index 0000000000..82cf91ede7
--- /dev/null
+++ b/src/qt/accel.cpp
@@ -0,0 +1,109 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/accel.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/accel.h"
+#include "wx/list.h"
+#include "wx/qt/private/converter.h"
+#include <QtCore/QVariant>
+
+// ----------------------------------------------------------------------------
+// wxAccelList: a list of wxAcceleratorEntries
+// ----------------------------------------------------------------------------
+
+WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxAccelList)
+
+// ----------------------------------------------------------------------------
+// wxAccelRefData: the data used by wxAcceleratorTable
+// ----------------------------------------------------------------------------
+
+class wxAccelRefData : public wxObjectRefData
+{
+    public:
+        wxAccelRefData()
+        {
+        }
+        
+        wxAccelRefData(const wxAccelRefData& data)
+        : wxObjectRefData()
+        {
+            m_accels = data.m_accels;
+        }
+        
+        virtual ~wxAccelRefData()
+        {
+            WX_CLEAR_LIST(wxAccelList, m_accels);
+        }
+        
+        wxAccelList m_accels;
+};
+
+// macro which can be used to access wxAccelRefData from wxAcceleratorTable
+#define M_ACCELDATA ((wxAccelRefData *)m_refData)
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS( wxAcceleratorTable, wxObject )
+
+QShortcut *ConvertAccelerator( wxAcceleratorEntry *e, QWidget *parent )
+{
+    // TODO: Not all keys have the same string representation in wx and qt
+    QShortcut *s = new QShortcut( wxQtConvertString( e->ToString() ), parent );
+    
+    // Set a property to save wx Command to send when activated
+    s->setProperty( "wxQt_Command", e->GetCommand() );
+
+    return s;
+}
+
+wxAcceleratorTable::wxAcceleratorTable()
+{
+}
+
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
+{
+    m_refData = new wxAccelRefData;
+    
+    for ( int i = 0; i < n; i++ )
+    {
+        M_ACCELDATA->m_accels.Append( new wxAcceleratorEntry( entries[i] ) );
+    }
+}
+
+QList< QShortcut* > wxAcceleratorTable::ConvertShortcutTable( QWidget *parent ) const
+{   
+    QList< QShortcut* > qtList;
+    
+    for ( wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() )
+    {
+        qtList << ConvertAccelerator( node->GetData(), parent );
+    }
+    
+    return qtList;
+}
+
+wxObjectRefData *wxAcceleratorTable::CreateRefData() const
+{
+    return new wxAccelRefData;
+}
+
+wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxAccelRefData(*(wxAccelRefData *)data);
+}
+
+bool wxAcceleratorTable::IsOk() const
+{
+    return (m_refData != NULL);
+}
diff --git a/src/qt/anybutton.cpp b/src/qt/anybutton.cpp
new file mode 100644
index 0000000000..f09c6ab88f
--- /dev/null
+++ b/src/qt/anybutton.cpp
@@ -0,0 +1,103 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/anybutton.cpp
+// Author:      Mariano Reingart
+// Copyright:   (c) 2014 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef wxHAS_ANY_BUTTON
+
+#ifndef WX_PRECOMP
+    #include "wx/anybutton.h"
+#endif
+
+#include "wx/bitmap.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtPushButton : public wxQtEventSignalHandler< QPushButton, wxAnyButton >
+{
+
+public:
+    wxQtPushButton( wxWindow *parent, wxAnyButton *handler);
+
+private:
+    void clicked(bool);
+};
+
+wxQtPushButton::wxQtPushButton(wxWindow *parent, wxAnyButton *handler)
+    : wxQtEventSignalHandler< QPushButton, wxAnyButton >( parent, handler )
+{
+    connect(this, &QPushButton::clicked, this, &wxQtPushButton::clicked);
+}
+
+void wxQtPushButton::clicked( bool WXUNUSED(checked) )
+{
+    wxAnyButton *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_BUTTON, handler->GetId() );
+        EmitEvent( event );
+    }
+}
+
+void wxAnyButton::QtCreate(wxWindow *parent)
+{
+    // create the default push button (used in button and bmp button)
+    m_qtPushButton = new wxQtPushButton( parent, this );
+}
+
+void wxAnyButton::QtSetBitmap( const wxBitmap &bitmap )
+{
+    // load the bitmap and resize the button:
+    QPixmap *pixmap = bitmap.GetHandle();
+    m_qtPushButton->setIcon( QIcon( *pixmap  ));
+    m_qtPushButton->setIconSize( pixmap->rect().size() );
+}
+
+void wxAnyButton::SetLabel( const wxString &label )
+{
+    m_qtPushButton->setText( wxQtConvertString( label ));
+}
+
+QPushButton *wxAnyButton::GetHandle() const
+{
+    return m_qtPushButton;
+}
+
+void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
+{
+    switch ( which )
+    {
+        case State_Normal:
+            QtSetBitmap(bitmap);
+            InvalidateBestSize();
+            break;
+
+        case State_Pressed:
+            wxMISSING_IMPLEMENTATION( wxSTRINGIZE( State_Pressed ));
+            break;
+
+        case State_Current:
+            wxMISSING_IMPLEMENTATION( wxSTRINGIZE( State_Current ));
+            break;
+
+        case State_Focused:
+            wxMISSING_IMPLEMENTATION( wxSTRINGIZE( State_Focused ));
+            break;
+
+        case State_Disabled:
+            wxMISSING_IMPLEMENTATION( wxSTRINGIZE( State_Disabled ));
+            break;
+
+        case State_Max:
+            wxMISSING_IMPLEMENTATION( wxSTRINGIZE( State_Max ));
+
+    }
+}
+
+#endif // wxHAS_ANY_BUTTON
diff --git a/src/qt/app.cpp b/src/qt/app.cpp
new file mode 100644
index 0000000000..007c50662b
--- /dev/null
+++ b/src/qt/app.cpp
@@ -0,0 +1,87 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/app.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/app.h"
+#include "wx/apptrait.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include <QtCore/QStringList>
+
+IMPLEMENT_DYNAMIC_CLASS( wxApp, wxAppBase )
+
+wxApp::wxApp()
+{
+    m_qtApplication = NULL;
+}
+
+
+wxApp::~wxApp()
+{
+    // Only delete if the app was actually initialized
+    if ( m_qtApplication != NULL )
+    {
+        m_qtApplication->deleteLater();
+        delete [] m_qtArgv;
+    }
+}
+
+bool wxApp::Initialize( int &argc, wxChar **argv )
+{
+    if ( !wxAppBase::Initialize( argc, argv ))
+        return false;
+
+    wxConvCurrent = &wxConvUTF8;
+
+    // (See: http://bugreports.qt.nokia.com/browse/QTBUG-7551)
+    // Need to store argc, argv. The argc, argv from wxAppBase are
+    // being initialized *after* Initialize();
+
+    // TODO: Check whether new/strdup etc. can be replaced with std::vector<>.
+
+    // Clone and store arguments
+    m_qtArgv = new char *[argc + 1];
+    for ( int i = 0; i < argc; i++ )
+    {
+        m_qtArgv[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
+    }
+    m_qtArgv[argc] = NULL;
+    m_qtArgc = argc;
+
+    m_qtApplication = new QApplication( m_qtArgc, m_qtArgv );
+
+    // Use the args returned by Qt as it may have deleted (processed) some of them
+    // Using QApplication::arguments() forces argument processing
+    QStringList qtArgs = m_qtApplication->arguments();
+    if ( qtArgs.size() != argc )
+    {
+        /* As per Qt 4.6: Here, qtArgc and qtArgv have been modified and can
+         * be used to replace our args (with Qt-flags removed). Also, they can be
+         * deleted as they are internally kept by Qt in a list after calling arguments().
+         * However, there isn't any guarantee of that in the docs, so we keep arguments
+         * ourselves and only delete then after the QApplication is deleted */
+        
+        // Qt changed the arguments
+        delete [] argv;
+        argv = new wxChar *[qtArgs.size() + 1];
+        for ( int i = 0; i < qtArgs.size(); i++ )
+        {
+#if wxUSE_UNICODE
+            argv[i] = wxStrdupW( wxConvUTF8.cMB2WX( qtArgs[i].toUtf8().data() ) );
+#else // wxUSE_UNICODE
+            argv[i] = wxStrdupA( wxConvUTF8.cMB2WX( qtArgs[i].toUtf8().data() ) );
+#endif // wxUSE_UNICODE
+        }
+
+        argc = m_qtApplication->arguments().size();
+        argv[argc] = NULL;
+    }
+
+    return true;
+}
diff --git a/src/qt/apptraits.cpp b/src/qt/apptraits.cpp
new file mode 100644
index 0000000000..81abfd02b0
--- /dev/null
+++ b/src/qt/apptraits.cpp
@@ -0,0 +1,63 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/apptraits.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/apptrait.h"
+#include "wx/stdpaths.h"
+#include "wx/evtloop.h"
+
+#include "wx/qt/timer.h"
+
+#include <QtGlobal>
+
+wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+
+#if wxUSE_TIMER
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxQtTimerImpl( timer );
+}
+#endif
+
+// #if wxUSE_THREADS
+// void wxGUIAppTraits::MutexGuiEnter()
+// {
+// }
+// 
+// void wxGUIAppTraits::MutexGuiLeave()
+// {
+// }
+
+// #endif
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
+{
+    if ( majVer )
+        *majVer = QT_VERSION >> 16;
+    if ( minVer )
+        *minVer = (QT_VERSION >> 8) & 0xFF;
+
+    return wxPORT_QT;
+}
+
+//#############################################################################
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+
+#endif
+
+//#############################################################################
diff --git a/src/qt/bitmap.cpp b/src/qt/bitmap.cpp
new file mode 100644
index 0000000000..82a1a94d32
--- /dev/null
+++ b/src/qt/bitmap.cpp
@@ -0,0 +1,530 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/bitmap.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/bitmap.h"
+#include "wx/image.h"
+#include "wx/rawbmp.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/utils.h"
+
+#include <QtGui/QPixmap>
+#include <QtGui/QBitmap>
+#include <QtWidgets/QLabel>
+
+static wxImage ConvertImage( QImage qtImage )
+{
+    bool hasAlpha = qtImage.hasAlphaChannel();
+    
+    int numPixels = qtImage.height() * qtImage.width();
+
+    //Convert to ARGB32 for scanLine
+    qtImage = qtImage.convertToFormat(QImage::Format_ARGB32);
+    
+    unsigned char *data = (unsigned char *)malloc(sizeof(char) * 3 * numPixels);
+    unsigned char *startData = data;
+    
+    unsigned char *alpha = NULL;
+    if (hasAlpha)
+        alpha = (unsigned char *)malloc(sizeof(char) * numPixels);
+
+    unsigned char *startAlpha = alpha;
+    
+    for (int y = 0; y < qtImage.height(); y++)
+    {
+        QRgb *line = (QRgb*)qtImage.scanLine(y);
+        
+        for (int x = 0; x < qtImage.width(); x++)
+        {
+            QRgb colour = line[x];
+            
+            data[0] = qRed(colour);
+            data[1] = qGreen(colour);
+            data[2] = qBlue(colour);
+            
+            if (hasAlpha)
+            {
+                alpha[0] = qAlpha(colour);
+                alpha++;
+            }
+            data += 3;
+        }
+    }
+    if (hasAlpha)
+        return wxImage(wxQtConvertSize(qtImage.size()), startData, startAlpha);
+    else
+        return wxImage(wxQtConvertSize(qtImage.size()), startData);
+}
+
+static QImage ConvertImage( const wxImage &image )
+{
+    bool hasAlpha = image.HasAlpha();
+    bool hasMask = image.HasMask();
+    QImage qtImage( wxQtConvertSize( image.GetSize() ),
+                   ( (hasAlpha || hasMask ) ? QImage::Format_ARGB32 : QImage::Format_RGB32 ) );
+    
+    unsigned char *data = image.GetData();
+    unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL;
+    QRgb colour;
+
+    QRgb maskedColour;
+    if ( hasMask )
+    {
+        unsigned char r, g, b;
+        image.GetOrFindMaskColour( &r, &g, &b );
+        maskedColour = ( r << 16 ) + ( g << 8 ) + b;
+    }
+    
+    for (int y = 0; y < image.GetHeight(); y++)
+    {
+        for (int x = 0; x < image.GetWidth(); x++)
+        {
+            if (hasAlpha)
+            {
+                colour = alpha[0] << 24;
+                alpha++;
+            }
+            else
+                colour = 0;
+            
+            colour += (data[0] << 16) + (data[1] << 8) + data[2];
+
+            if ( hasMask && colour != maskedColour )
+                colour += 0xFF000000; // 255 << 24
+            
+            qtImage.setPixel(x, y, colour);
+            
+            data += 3;
+        }
+    }
+    return qtImage;
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapRefData
+//-----------------------------------------------------------------------------
+
+class wxBitmapRefData: public wxGDIRefData
+{
+    public:
+        wxBitmapRefData() : wxGDIRefData()
+        {
+            m_mask = NULL;
+            m_qtPixmap = new QPixmap();
+        }
+        
+        wxBitmapRefData( const wxBitmapRefData& data ) : wxGDIRefData()
+        {
+            m_mask = NULL;
+            m_qtPixmap = data.m_qtPixmap;
+        }
+        
+        wxBitmapRefData( int width, int height, int depth ) : wxGDIRefData()
+        {
+            m_mask = NULL;
+            if (depth == 1) {
+                m_qtPixmap = new QBitmap( width, height );
+            } else {
+                m_qtPixmap = new QPixmap( width, height );
+            }
+        }
+        
+        wxBitmapRefData( QPixmap pix ) : wxGDIRefData()
+        {
+            m_mask = NULL;
+            m_qtPixmap = new QPixmap(pix);
+        }
+
+        virtual ~wxBitmapRefData()
+        {
+            if (m_qtPixmap != NULL)
+                delete m_qtPixmap;
+        }
+
+        QPixmap *m_qtPixmap;
+        wxMask *m_mask;
+};
+
+//-----------------------------------------------------------------------------
+// wxBitmap
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS( wxBitmap, wxObject )
+
+#define M_PIXDATA (*((wxBitmapRefData *)m_refData)->m_qtPixmap)
+
+void wxBitmap::InitStandardHandlers()
+{
+}
+
+wxBitmap::wxBitmap()
+{
+}
+
+wxBitmap::wxBitmap(QPixmap pix)
+{
+    m_refData = new wxBitmapRefData(pix);
+}
+
+wxBitmap::wxBitmap(const wxBitmap& bmp)
+{
+    Ref(bmp);
+}
+
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth )
+{
+    wxASSERT(depth == 1);
+
+    if (width > 0 && height > 0 && depth == 1)
+    {
+        m_refData = new wxBitmapRefData();
+        ((wxBitmapRefData *)m_refData)->m_qtPixmap =
+            new QBitmap(QBitmap::fromData(QSize(width, height), (const uchar*)bits));
+    }
+}
+
+wxBitmap::wxBitmap(int width, int height, int depth)
+{
+    Create(width, height, depth);
+}
+
+wxBitmap::wxBitmap(const wxSize& sz, int depth )
+{
+    Create(sz, depth);
+}
+
+// Create a wxBitmap from xpm data
+wxBitmap::wxBitmap(const char* const* bits)
+{
+    m_refData = new wxBitmapRefData();
+    ((wxBitmapRefData *)m_refData)->m_qtPixmap = new QPixmap( bits );
+}
+
+wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type )
+{
+    LoadFile(filename, type);
+}
+
+wxBitmap::wxBitmap(const wxImage& image, int depth )
+{
+    Qt::ImageConversionFlags flags = 0;
+    if (depth == 1)
+        flags = Qt::MonoOnly;
+    m_refData = new wxBitmapRefData(QPixmap::fromImage(ConvertImage(image), flags));
+}
+
+
+bool wxBitmap::Create(int width, int height, int depth )
+{
+    UnRef();
+    m_refData = new wxBitmapRefData(width, height, depth);
+    
+    return true;
+}
+
+bool wxBitmap::Create(const wxSize& sz, int depth )
+{
+    return Create(sz.GetWidth(), sz.GetHeight(), depth);
+}
+
+bool wxBitmap::Create(int width, int height, const wxDC& WXUNUSED(dc))
+{
+    return Create(width, height);
+}
+
+int wxBitmap::GetHeight() const
+{
+    return M_PIXDATA.height();
+}
+
+int wxBitmap::GetWidth() const
+{
+    return M_PIXDATA.width();
+}
+
+int wxBitmap::GetDepth() const
+{
+    return M_PIXDATA.depth();
+}
+
+
+#if wxUSE_IMAGE
+wxImage wxBitmap::ConvertToImage() const
+{
+    return ConvertImage(M_PIXDATA.toImage());
+}
+
+#endif // wxUSE_IMAGE
+
+wxMask *wxBitmap::GetMask() const
+{
+    return ( ((wxBitmapRefData *)m_refData)->m_mask );
+}
+
+void wxBitmap::SetMask(wxMask *mask)
+{
+    wxMask *bitmapMask = ( ((wxBitmapRefData *)m_refData)->m_mask );
+
+    if (bitmapMask)
+        delete bitmapMask;
+
+    bitmapMask = mask;
+    ((wxBitmapRefData *)m_refData)->m_mask = mask;
+    M_PIXDATA.setMask( *mask->GetHandle() );
+}
+
+
+wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
+{
+    return wxBitmap(M_PIXDATA.copy(wxQtConvertRect(rect)));
+}
+
+
+bool wxBitmap::SaveFile(const wxString &name, wxBitmapType type,
+              const wxPalette *WXUNUSED(palette) ) const
+{   
+    #if wxUSE_IMAGE
+    //Try to save using wx
+    wxImage image = ConvertToImage();
+    if (image.IsOk() && image.SaveFile(name, type))
+        return true;
+    #endif
+    
+    //Try to save using Qt
+    const char* type_name = NULL;
+    switch (type)
+    {
+        case wxBITMAP_TYPE_BMP:  type_name = "bmp";  break;
+        case wxBITMAP_TYPE_ICO:  type_name = "ico";  break;
+        case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break;
+        case wxBITMAP_TYPE_PNG:  type_name = "png";  break;
+        case wxBITMAP_TYPE_GIF:  type_name = "gif";  break;
+        case wxBITMAP_TYPE_CUR:  type_name = "cur";  break;
+        case wxBITMAP_TYPE_TIFF: type_name = "tif";  break;
+        case wxBITMAP_TYPE_XBM:  type_name = "xbm";  break;
+        case wxBITMAP_TYPE_PCX:  type_name = "pcx";  break;
+        case wxBITMAP_TYPE_BMP_RESOURCE:
+        case wxBITMAP_TYPE_ICO_RESOURCE:
+        case wxBITMAP_TYPE_CUR_RESOURCE:
+        case wxBITMAP_TYPE_XBM_DATA:
+        case wxBITMAP_TYPE_XPM:
+        case wxBITMAP_TYPE_XPM_DATA:
+        case wxBITMAP_TYPE_TIFF_RESOURCE:
+        case wxBITMAP_TYPE_GIF_RESOURCE:
+        case wxBITMAP_TYPE_PNG_RESOURCE:
+        case wxBITMAP_TYPE_JPEG_RESOURCE:
+        case wxBITMAP_TYPE_PNM:
+        case wxBITMAP_TYPE_PNM_RESOURCE:
+        case wxBITMAP_TYPE_PCX_RESOURCE:
+        case wxBITMAP_TYPE_PICT:
+        case wxBITMAP_TYPE_PICT_RESOURCE:
+        case wxBITMAP_TYPE_ICON:
+        case wxBITMAP_TYPE_ICON_RESOURCE:
+        case wxBITMAP_TYPE_ANI:
+        case wxBITMAP_TYPE_IFF:
+        case wxBITMAP_TYPE_TGA:
+        case wxBITMAP_TYPE_MACCURSOR:
+        case wxBITMAP_TYPE_MACCURSOR_RESOURCE:
+        case wxBITMAP_TYPE_MAX:
+        case wxBITMAP_TYPE_ANY:
+        default:
+            break;
+    }
+    return type_name &&
+        M_PIXDATA.save(wxQtConvertString(name), type_name);
+}
+
+bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
+{
+#if wxUSE_IMAGE
+    //Try to load using wx
+    wxImage image;
+    if (image.LoadFile(name, type) && image.IsOk())
+    {
+        *this = wxBitmap(image);
+        return true;
+    }
+    else
+#endif
+    {
+        //Try to load using Qt
+        AllocExclusive();
+        
+        //TODO: Use passed image type instead of auto-detection
+        return M_PIXDATA.load(wxQtConvertString(name));
+    }
+}
+
+
+#if wxUSE_PALETTE
+wxPalette *wxBitmap::GetPalette() const
+{
+    wxMISSING_IMPLEMENTATION( "wxBitmap palettes" );
+    return 0;
+}
+
+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+    wxMISSING_IMPLEMENTATION( "wxBitmap palettes" );
+}
+
+#endif // wxUSE_PALETTE
+
+// copies the contents and mask of the given (colour) icon to the bitmap
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    *this = icon;
+    return IsOk();
+}
+
+
+// implementation:
+void wxBitmap::SetHeight(int height)
+{
+    M_PIXDATA = QPixmap(GetWidth(), height);
+}
+
+void wxBitmap::SetWidth(int width)
+{
+    M_PIXDATA = QPixmap(width, GetHeight());
+}
+
+void wxBitmap::SetDepth(int depth)
+{
+    if (depth == 1)
+        M_PIXDATA = QBitmap(GetWidth(), GetHeight());
+    else
+        M_PIXDATA = QPixmap(GetWidth(), GetHeight());
+}
+
+
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    void* bits = NULL;
+    // allow access if bpp is valid and matches existence of alpha
+    if ( !M_PIXDATA.isNull() )
+    {
+        QImage qimage = M_PIXDATA.toImage();
+        bool hasAlpha = M_PIXDATA.hasAlphaChannel();
+        if ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha))
+        {
+            data.m_height = qimage.height();
+            data.m_width = qimage.width();
+            data.m_stride = qimage.bytesPerLine();
+            bits = (void*) qimage.bits();
+        }
+    }
+    return bits;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+}
+
+QPixmap *wxBitmap::GetHandle() const
+{
+    return ( m_refData != NULL ) ? ((wxBitmapRefData *)m_refData)->m_qtPixmap : NULL;
+}
+
+wxGDIRefData *wxBitmap::CreateGDIRefData() const
+{
+    return new wxBitmapRefData;
+}
+
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBitmapRefData(*(wxBitmapRefData *)data);
+}
+
+bool wxBitmap::HasAlpha() const
+{
+    return M_PIXDATA.hasAlphaChannel();
+}
+
+//-----------------------------------------------------------------------------
+// wxMask
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS( wxMask, wxObject )
+
+wxMask::wxMask()
+{
+    m_qtBitmap = NULL;
+}
+
+wxMask::wxMask(const wxMask &mask)
+{
+    m_qtBitmap = new QBitmap(*mask.GetHandle());
+}
+
+wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
+{
+    m_qtBitmap = NULL;
+    Create(bitmap, colour);
+}
+
+wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
+{
+    m_qtBitmap = NULL;
+    Create(bitmap, paletteIndex);
+}
+
+wxMask::wxMask(const wxBitmap& bitmap)
+{
+    m_qtBitmap = NULL;
+    Create(bitmap);
+}
+
+wxMask::~wxMask()
+{
+    if (m_qtBitmap)
+        delete m_qtBitmap;
+}
+
+bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
+{
+    if (!bitmap.IsOk())
+        return false;
+
+    if (m_qtBitmap)
+        delete m_qtBitmap;
+
+    m_qtBitmap = new QBitmap(bitmap.GetHandle()->createMaskFromColor(colour.GetHandle()));
+    return true;
+}
+
+bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex))
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+    return false;
+}
+
+bool wxMask::Create(const wxBitmap& bitmap)
+{
+    //Only for mono bitmaps
+    if (!bitmap.IsOk() || bitmap.GetDepth() != 1)
+        return false;
+
+    if (m_qtBitmap)
+        delete m_qtBitmap;
+
+    m_qtBitmap = new QBitmap(*bitmap.GetHandle());
+    return true;
+}
+
+wxBitmap wxMask::GetBitmap() const
+{
+    return wxBitmap(*m_qtBitmap);
+}
+
+QBitmap *wxMask::GetHandle() const
+{
+    return m_qtBitmap;
+}
diff --git a/src/qt/bmpbuttn.cpp b/src/qt/bmpbuttn.cpp
new file mode 100644
index 0000000000..8f8c6321f1
--- /dev/null
+++ b/src/qt/bmpbuttn.cpp
@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/bmpbuttn.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/bmpbuttn.h"
+
+wxBitmapButton::wxBitmapButton()
+{
+}
+
+
+wxBitmapButton::wxBitmapButton(wxWindow *parent,
+               wxWindowID id,
+               const wxBitmap& bitmap,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style,
+               const wxValidator& validator,
+               const wxString& name )
+{
+    Create( parent, id, bitmap, pos, size, style, validator, name );
+}
+
+
+bool wxBitmapButton::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxBitmap& bitmap,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name )
+{
+    if ( !wxBitmapButtonBase::Create( parent, id, pos, size, style, validator, name ))
+        return false;
+    // Show the initial bitmap and resize accordingly:
+    if ( bitmap.IsOk() )
+    {
+        wxBitmapButtonBase::SetBitmapLabel(bitmap);
+
+        // we need to adjust the size after setting the bitmap as it may be too
+        // big for the default button size
+        SetInitialSize(size);
+    }
+    return true;
+}
+
diff --git a/src/qt/brush.cpp b/src/qt/brush.cpp
new file mode 100644
index 0000000000..5f997c9a05
--- /dev/null
+++ b/src/qt/brush.cpp
@@ -0,0 +1,196 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/brush.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/brush.h"
+#include "wx/colour.h"
+#include "wx/qt/private/utils.h"
+#include "wx/bitmap.h"
+
+#include <QtGui/QBrush>
+
+
+static Qt::BrushStyle ConvertBrushStyle(wxBrushStyle style)
+{
+    switch (style)
+    {
+        case wxBRUSHSTYLE_INVALID:
+        case wxBRUSHSTYLE_SOLID:
+            return Qt::SolidPattern;
+
+        case wxBRUSHSTYLE_TRANSPARENT:
+            return Qt::NoBrush;
+
+        case wxBRUSHSTYLE_BDIAGONAL_HATCH:
+            return Qt::BDiagPattern;
+
+        case wxBRUSHSTYLE_CROSSDIAG_HATCH:
+            return Qt::DiagCrossPattern;
+
+        case wxBRUSHSTYLE_FDIAGONAL_HATCH:
+            return Qt::FDiagPattern;
+
+        case wxBRUSHSTYLE_CROSS_HATCH:
+            return Qt::CrossPattern;
+
+        case wxBRUSHSTYLE_HORIZONTAL_HATCH:
+            return Qt::HorPattern;
+
+        case wxBRUSHSTYLE_VERTICAL_HATCH:
+            return Qt::VerPattern;
+            
+        case wxBRUSHSTYLE_STIPPLE:
+        case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE:
+        case wxBRUSHSTYLE_STIPPLE_MASK:
+            return Qt::TexturePattern;
+            break;
+    }
+    return Qt::SolidPattern;
+}
+
+//-----------------------------------------------------------------------------
+// wxBrush
+//-----------------------------------------------------------------------------
+
+class wxBrushRefData: public wxGDIRefData
+{
+    public:
+        wxBrushRefData()
+        {
+        }
+        
+        wxBrushRefData( const wxBrushRefData& data )
+        : wxGDIRefData()
+        {
+            m_qtBrush = data.m_qtBrush;
+        }
+        
+        bool operator == (const wxBrushRefData& data) const
+        {
+            return m_qtBrush == data.m_qtBrush;
+        }
+        
+        QBrush m_qtBrush;
+
+        // To keep if mask is stippled 
+        wxBrushStyle m_style;
+};
+
+//-----------------------------------------------------------------------------
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)->m_qtBrush
+#define M_STYLEDATA ((wxBrushRefData *)m_refData)->m_style
+
+wxBrush::wxBrush()
+{
+    m_refData = new wxBrushRefData();
+}
+
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style )
+{
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA.setColor(col.GetHandle());
+    M_BRUSHDATA.setStyle(ConvertBrushStyle(style));
+    M_STYLEDATA = style;
+}
+
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA.setColor(col.GetHandle());
+    M_BRUSHDATA.setStyle(ConvertBrushStyle((wxBrushStyle)style));
+    M_STYLEDATA = (wxBrushStyle)style;
+}
+
+wxBrush::wxBrush(const wxBitmap& stipple)
+{
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA.setTexture(*stipple.GetHandle());
+    if (stipple.GetMask() != NULL)
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE;
+}
+
+
+void wxBrush::SetColour(const wxColour& col)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setColor(col.GetHandle());
+}
+
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setColor(QColor(r, g, b));
+}
+
+void wxBrush::SetStyle(wxBrushStyle style)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setStyle(ConvertBrushStyle((wxBrushStyle)style));
+    M_STYLEDATA = style;
+}
+
+void wxBrush::SetStipple(const wxBitmap& stipple)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setTexture(*stipple.GetHandle());
+
+    if (stipple.GetMask() != NULL)
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE;
+}
+
+
+bool wxBrush::operator==(const wxBrush& brush) const
+{
+    if (m_refData == brush.m_refData) return true;
+    
+    if (!m_refData || !brush.m_refData) return false;
+    
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+}
+
+
+wxColour wxBrush::GetColour() const
+{
+    return wxColour(M_BRUSHDATA.color());
+}
+
+wxBrushStyle wxBrush::GetStyle() const
+{
+    return M_STYLEDATA;
+}
+
+wxBitmap *wxBrush::GetStipple() const
+{
+    QPixmap p = M_BRUSHDATA.texture();
+
+    if (p.isNull())
+        return new wxBitmap();
+    else
+        return new wxBitmap(p);
+}
+
+QBrush wxBrush::GetHandle() const
+{
+    return M_BRUSHDATA;
+}
+
+wxGDIRefData *wxBrush::CreateGDIRefData() const
+{
+    return new wxBrushRefData;
+}
+
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBrushRefData(*(wxBrushRefData *)data);
+}
diff --git a/src/qt/button.cpp b/src/qt/button.cpp
new file mode 100644
index 0000000000..d06e145730
--- /dev/null
+++ b/src/qt/button.cpp
@@ -0,0 +1,66 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/button.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/button.h"
+#include "wx/bitmap.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/winevent.h"
+
+
+wxButton::wxButton()
+{
+}
+
+wxButton::wxButton(wxWindow *parent, wxWindowID id,
+       const wxString& label,
+       const wxPoint& pos,
+       const wxSize& size, long style,
+       const wxValidator& validator,
+       const wxString& name )
+{
+    Create( parent, id, label, pos, size, style, validator, name );
+}
+
+bool wxButton::Create(wxWindow *parent, wxWindowID id,
+       const wxString& label,
+       const wxPoint& pos,
+       const wxSize& size, long style,
+       const wxValidator& validator,
+       const wxString& name )
+{     
+    QtCreate(parent);
+    SetLabel( wxIsStockID( id ) ? wxGetStockLabel( id ) : label );
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+wxWindow *wxButton::SetDefault()
+{
+    wxWindow *oldDefault = wxButtonBase::SetDefault();
+
+    m_qtPushButton->setDefault( true );
+
+    return oldDefault;
+
+}
+
+/* static */
+wxSize wxButtonBase::GetDefaultSize()
+{
+    static wxSize size = wxDefaultSize;
+    if (size == wxDefaultSize)
+    {
+        // Default size of buttons should be same as size of stock
+        // buttons as used in most GTK+ apps. (currently this is aproximate)
+        QPushButton btn;
+        size = wxQtConvertSize(btn.sizeHint());
+    }
+    return size;
+}
diff --git a/src/qt/calctrl.cpp b/src/qt/calctrl.cpp
new file mode 100644
index 0000000000..4267266018
--- /dev/null
+++ b/src/qt/calctrl.cpp
@@ -0,0 +1,349 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/calctrl.cpp
+// Purpose:     wxCalendarCtrl control implementation for wxQt
+// Author:      Kolya Kosenko
+// Created:     2010-05-12
+// Copyright:   (C) 2010 Kolya Kosenko
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_CALENDARCTRL
+
+#include "wx/calctrl.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+#include <QtGui/QTextCharFormat>
+
+
+class wxQtCalendarWidget : public wxQtEventSignalHandler< QCalendarWidget, wxCalendarCtrl >
+{
+
+public:
+    wxQtCalendarWidget( wxWindow *parent, wxCalendarCtrl *handler );
+
+private:
+    void selectionChanged();
+    void activated(const QDate &date);
+
+private:
+    QDate m_date;
+};
+
+
+void wxCalendarCtrl::Init()
+{
+    m_qtCalendar = NULL;
+
+    for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ )
+    {
+        m_attrs[n] = NULL;
+    }
+}
+
+wxCalendarCtrl::~wxCalendarCtrl()
+{
+    for ( size_t n = 0; n < WXSIZEOF(m_attrs); n++ )
+    {
+        delete m_attrs[n];
+    }
+}
+
+bool wxCalendarCtrl::Create(wxWindow *parent, wxWindowID id, const wxDateTime& date,
+    const wxPoint& pos, const wxSize& size, long style, const wxString& name )
+{
+    m_qtCalendar = new wxQtCalendarWidget( parent, this );
+    m_qtCalendar->resize(m_qtCalendar->sizeHint());
+
+    {
+        // Init holiday colours
+        const QTextCharFormat format = m_qtCalendar->weekdayTextFormat(Qt::Sunday);
+        m_colHolidayFg = format.foreground().color();
+
+        wxMISSING_IMPLEMENTATION( "Get holiday background color" );
+
+        // Bug in Qt: returned background color is incorrect
+        //m_colHolidayBg = format.background().color();
+    }
+
+    {
+        // synchronize header colours
+        QTextCharFormat format = m_qtCalendar->headerTextFormat();
+
+        bool sync = false;
+
+        if ( m_colHeaderFg.IsOk() )
+            sync = true;
+        else
+            m_colHeaderFg = format.foreground().color();
+
+        if ( m_colHeaderBg.IsOk() )
+            sync = true;
+        else
+            m_colHeaderFg = format.background().color();
+
+        if ( sync )
+            SetHeaderColours(m_colHeaderFg, m_colHeaderBg);
+    }
+
+    UpdateStyle();
+
+    if ( date.IsValid() )
+        SetDate(date);
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+void wxCalendarCtrl::UpdateStyle()
+{
+    if ( !m_qtCalendar )
+        return;
+
+    if ( m_windowStyle & wxCAL_MONDAY_FIRST )
+        m_qtCalendar->setFirstDayOfWeek(Qt::Monday);
+    else // wxCAL_SUNDAY_FIRST
+        m_qtCalendar->setFirstDayOfWeek(Qt::Sunday);
+
+    if ( m_windowStyle & wxCAL_SHOW_WEEK_NUMBERS )
+        m_qtCalendar->setVerticalHeaderFormat(QCalendarWidget::ISOWeekNumbers);
+    else
+        m_qtCalendar->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+
+    RefreshHolidays();
+}
+
+void wxCalendarCtrl::SetWindowStyleFlag(long style)
+{
+    const long styleOld = GetWindowStyleFlag();
+
+    wxCalendarCtrlBase::SetWindowStyleFlag(style);
+
+    if ( styleOld != GetWindowStyleFlag() )
+        UpdateStyle();
+}
+
+bool wxCalendarCtrl::SetDate(const wxDateTime& date)
+{
+    wxCHECK_MSG( date.IsValid(), false, "invalid date" );
+    if ( !m_qtCalendar )
+        return false;
+
+    m_qtCalendar->setSelectedDate(wxQtConvertDate(date));
+
+    return true;
+}
+
+wxDateTime wxCalendarCtrl::GetDate() const
+{
+    if ( !m_qtCalendar )
+        return wxDateTime();
+
+    return wxQtConvertDate(m_qtCalendar->selectedDate());
+}
+
+bool wxCalendarCtrl::SetDateRange(const wxDateTime& lowerdate,
+                                  const wxDateTime& upperdate)
+{
+    if ( !m_qtCalendar )
+        return false;
+
+    m_qtCalendar->setMinimumDate(wxQtConvertDate(lowerdate));
+    m_qtCalendar->setMaximumDate(wxQtConvertDate(upperdate));
+
+    return true;
+}
+
+bool wxCalendarCtrl::GetDateRange(wxDateTime *lowerdate,
+                                  wxDateTime *upperdate) const
+{
+    if ( !m_qtCalendar )
+        return false;
+
+    if (lowerdate)
+        *lowerdate = wxQtConvertDate(m_qtCalendar->minimumDate());
+    if (upperdate)
+        *upperdate = wxQtConvertDate(m_qtCalendar->maximumDate());
+
+    return true;
+}
+
+// Copied from wxMSW
+bool wxCalendarCtrl::EnableMonthChange(bool enable)
+{
+    if ( !wxCalendarCtrlBase::EnableMonthChange(enable) )
+        return false;
+
+    wxDateTime dtStart, dtEnd;
+    if ( !enable )
+    {
+        dtStart = GetDate();
+        dtStart.SetDay(1);
+
+        dtEnd = dtStart.GetLastMonthDay();
+    }
+    //else: leave them invalid to remove the restriction
+
+    SetDateRange(dtStart, dtEnd);
+
+    return true;
+}
+
+void wxCalendarCtrl::Mark(size_t day, bool mark)
+{
+    wxCHECK_RET( day > 0 && day < 32, "invalid day" );
+
+    if ( !m_qtCalendar )
+        return;
+
+    QDate date = m_qtCalendar->selectedDate();
+    date.setDate(date.year(), date.month(), day);
+
+    QTextCharFormat format = m_qtCalendar->dateTextFormat(date);
+    format.setFontWeight(mark ? QFont::Bold : QFont::Normal);
+    m_qtCalendar->setDateTextFormat(date, format);
+}
+
+void wxCalendarCtrl::SetHoliday(size_t day)
+{
+    wxCHECK_RET( day > 0 && day < 32, "invalid day" );
+
+    if ( !(m_windowStyle & wxCAL_SHOW_HOLIDAYS) )
+        return;
+
+    if ( !m_qtCalendar )
+        return;
+
+    QDate date = m_qtCalendar->selectedDate();
+    date.setDate(date.year(), date.month(), day);
+
+    QTextCharFormat format = m_qtCalendar->dateTextFormat(date);
+    format.setForeground(m_colHolidayFg.GetHandle());
+    m_qtCalendar->setDateTextFormat(date, format);
+}
+
+void wxCalendarCtrl::SetHolidayColours(const wxColour& colFg, const wxColour& colBg)
+{
+    m_colHolidayFg = colFg;
+    m_colHolidayBg = colBg;
+    RefreshHolidays();
+}
+
+void wxCalendarCtrl::RefreshHolidays()
+{
+    if ( !m_qtCalendar )
+        return;
+
+    QTextCharFormat format;
+    if ( m_windowStyle & wxCAL_SHOW_HOLIDAYS )
+    {
+        if ( m_colHolidayFg.IsOk() )
+            format.setForeground(m_colHolidayFg.GetHandle());
+        if ( m_colHolidayBg.IsOk() )
+            format.setBackground(m_colHolidayBg.GetHandle());
+    }
+    else
+    {
+        format.setForeground(m_qtCalendar->weekdayTextFormat(Qt::Monday)
+            .foreground().color());
+
+        wxMISSING_IMPLEMENTATION( "Set holiday background color" );
+
+        // Bug in Qt: returned background color is incorrect
+        //format.setBackground(m_qtCalendar->weekdayTextFormat(Qt::Monday)
+        //    .background().color());
+    }
+    m_qtCalendar->setWeekdayTextFormat(Qt::Saturday, format);
+    m_qtCalendar->setWeekdayTextFormat(Qt::Sunday,   format);
+}
+
+void wxCalendarCtrl::SetHeaderColours(const wxColour& colFg, const wxColour& colBg)
+{
+    m_colHeaderFg = colFg;
+    m_colHeaderBg = colBg;
+
+    if ( !m_qtCalendar )
+        return;
+
+    QTextCharFormat format = m_qtCalendar->headerTextFormat();
+    if ( m_colHeaderFg.IsOk() )
+        format.setForeground(m_colHeaderFg.GetHandle());
+    if ( m_colHeaderBg.IsOk() )
+        format.setBackground(m_colHeaderBg.GetHandle());
+    m_qtCalendar->setHeaderTextFormat(format);
+}
+
+wxCalendarDateAttr *wxCalendarCtrl::GetAttr(size_t day) const
+{
+    wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") );
+
+    return m_attrs[day - 1];
+}
+
+void wxCalendarCtrl::SetAttr(size_t day, wxCalendarDateAttr *attr)
+{
+    wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") );
+
+    delete m_attrs[day - 1];
+    m_attrs[day - 1] = attr;
+
+    QDate date = m_qtCalendar->selectedDate();
+    date.setDate(date.year(), date.month(), day);
+
+    QTextCharFormat format = m_qtCalendar->dateTextFormat(date);
+    if ( attr->HasTextColour() )
+        format.setForeground(attr->GetTextColour().GetHandle());
+    if ( attr->HasBackgroundColour() )
+        format.setBackground(attr->GetBackgroundColour().GetHandle());
+
+    wxMISSING_IMPLEMENTATION( "Setting font" );
+
+    // wxFont is not implemented yet
+    //if ( attr->HasFont() )
+    //    format.setFont(attr->GetFont().GetQFont());
+    
+    m_qtCalendar->setDateTextFormat(date, format);
+}
+
+QCalendarWidget *wxCalendarCtrl::GetHandle() const
+{
+    return m_qtCalendar;
+}
+
+//=============================================================================
+
+wxQtCalendarWidget::wxQtCalendarWidget( wxWindow *parent, wxCalendarCtrl *handler )
+    : wxQtEventSignalHandler< QCalendarWidget, wxCalendarCtrl >( parent, handler )
+{
+    m_date = selectedDate();
+    connect(this, &QCalendarWidget::selectionChanged, this, &wxQtCalendarWidget::selectionChanged);
+    connect(this, &QCalendarWidget::activated, this, &wxQtCalendarWidget::activated);
+}
+
+void wxQtCalendarWidget::selectionChanged()
+{
+    wxCalendarCtrl *win = GetHandler();
+    if ( win )
+    {
+        GetHandler()->GenerateAllChangeEvents(wxQtConvertDate(m_date));
+        m_date = selectedDate();
+    }
+}
+
+void wxQtCalendarWidget::activated(const QDate &WXUNUSED(date))
+{
+    wxCalendarCtrl *handler = GetHandler();
+    if ( handler )
+    {
+        handler->GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED);
+    }
+}
+
+#endif // wxUSE_CALENDARCTRL
diff --git a/src/qt/checkbox.cpp b/src/qt/checkbox.cpp
new file mode 100644
index 0000000000..537daa4281
--- /dev/null
+++ b/src/qt/checkbox.cpp
@@ -0,0 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/checkbox.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/checkbox.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+class wxQtCheckBox : public wxQtEventSignalHandler< QCheckBox, wxCheckBox >
+{
+public:
+    wxQtCheckBox( wxWindow *parent, wxCheckBox *handler );
+
+private:
+    void clicked( bool checked );
+};
+
+wxQtCheckBox::wxQtCheckBox( wxWindow *parent, wxCheckBox *handler )
+    : wxQtEventSignalHandler< QCheckBox, wxCheckBox >( parent, handler )
+{
+    connect(this, &QCheckBox::clicked, this, &wxQtCheckBox::clicked);
+}
+
+void wxQtCheckBox::clicked( bool checked )
+{
+    wxCheckBox *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_CHECKBOX, handler->GetId() );
+        if (!handler->Is3rdStateAllowedForUser() &&
+            checkState() == Qt::PartiallyChecked)
+            setCheckState(Qt::Checked);
+
+        event.SetInt( checked );
+        EmitEvent( event );
+    }
+}
+
+
+wxCheckBox::wxCheckBox()
+{
+}
+
+wxCheckBox::wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
+        const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator,
+        const wxString& name )
+{
+    Create( parent, id, label, pos, size, style, validator, name );
+}
+
+bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator,
+            const wxString& name )
+{
+    m_qtCheckBox = new wxQtCheckBox( parent, this );
+    m_qtCheckBox->setText( wxQtConvertString( label ) );
+
+    // Do the initialization here as WXValidateStyle may fail in unit tests
+    bool ok = QtCreateControl( parent, id, pos, size, style, validator, name );
+
+    WXValidateStyle(&style);
+
+    if ( style & wxCHK_2STATE )
+        m_qtCheckBox->setTristate( false );
+    else if ( style & wxCHK_3STATE )
+        m_qtCheckBox->setTristate( true );
+    if ( style & wxALIGN_RIGHT )
+        m_qtCheckBox->setLayoutDirection( Qt::RightToLeft );
+
+    return ok;
+}
+
+
+void wxCheckBox::SetValue(bool value)
+{
+    m_qtCheckBox->setChecked( value );
+}
+
+bool wxCheckBox::GetValue() const
+{
+    return m_qtCheckBox->isChecked();
+}
+
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
+{
+    switch (state)
+    {
+    case wxCHK_UNCHECKED:
+        m_qtCheckBox->setCheckState(Qt::Unchecked);
+        break;
+
+    case wxCHK_CHECKED:
+        m_qtCheckBox->setCheckState(Qt::Checked);
+        break;
+
+    case wxCHK_UNDETERMINED:
+        m_qtCheckBox->setCheckState(Qt::PartiallyChecked);
+        break;
+    }
+}
+
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
+{
+    switch (m_qtCheckBox->checkState())
+    {
+    case Qt::Unchecked:
+        return wxCHK_UNCHECKED;
+
+    case Qt::Checked:
+        return wxCHK_CHECKED;
+        
+    case Qt::PartiallyChecked:
+        return wxCHK_UNDETERMINED;
+    }
+}
+
+QCheckBox *wxCheckBox::GetHandle() const
+{
+    return m_qtCheckBox;
+}
diff --git a/src/qt/checklst.cpp b/src/qt/checklst.cpp
new file mode 100644
index 0000000000..2b96fb8c46
--- /dev/null
+++ b/src/qt/checklst.cpp
@@ -0,0 +1,85 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/checklst.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/checklst.h"
+
+wxCheckListBox::wxCheckListBox()
+{
+}
+
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        int nStrings,
+        const wxString *choices,
+        long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    Create( parent, id, pos, size, nStrings, choices, style, validator, name );
+}
+
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    Create( parent, id, pos, size, choices, style, validator, name );
+}
+
+wxCheckListBox::~wxCheckListBox()
+{
+    Clear();
+}
+
+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
+              const wxPoint& pos,
+              const wxSize& size,
+              int n, const wxString choices[],
+              long style,
+              const wxValidator& validator,
+              const wxString& name )
+{
+    return wxCheckListBoxBase::Create( parent, id, pos, size, n, choices, style, validator, name );
+}
+
+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
+              const wxPoint& pos,
+              const wxSize& size,
+              const wxArrayString& choices,
+              long style,
+              const wxValidator& validator,
+              const wxString& name )
+{
+    return wxCheckListBoxBase::Create( parent, id, pos, size, choices, style, validator, name );
+}
+
+void wxCheckListBox::Init()
+{
+    m_hasCheckBoxes = true;
+}
+
+bool wxCheckListBox::IsChecked(unsigned int n) const
+{
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    wxCHECK_MSG(item != NULL, false, wxT("wrong listbox index") );
+    return item->checkState() == Qt::Checked;
+}
+
+void wxCheckListBox::Check(unsigned int n, bool check )
+{
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    wxCHECK_RET(item != NULL, wxT("wrong listbox index") );
+    return item->setCheckState(check ? Qt::Checked : Qt::Unchecked);
+}
+
diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp
new file mode 100644
index 0000000000..fc436daa7a
--- /dev/null
+++ b/src/qt/choice.cpp
@@ -0,0 +1,180 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/choice.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/choice.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QComboBox>
+
+class wxQtChoice : public wxQtEventSignalHandler< QComboBox, wxChoice >
+{
+public:
+    wxQtChoice( wxWindow *parent, wxChoice *handler );
+
+private:
+    void activated(int index);
+};
+
+wxQtChoice::wxQtChoice( wxWindow *parent, wxChoice *handler )
+    : wxQtEventSignalHandler< QComboBox, wxChoice >( parent, handler )
+{
+    // the activated signal is overloaded, the following explicit cast is needed:
+    connect(this, static_cast<void (QComboBox::*)(int index)>(&QComboBox::activated),
+            this, &wxQtChoice::activated);
+}
+
+void wxQtChoice::activated(int WXUNUSED(index))
+{
+    wxChoice *handler = GetHandler();
+    if ( handler )
+        handler->SendSelectionChangedEvent(wxEVT_CHOICE);
+}
+
+
+wxChoice::wxChoice()
+{
+}
+
+
+wxChoice::wxChoice( wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        int n, const wxString choices[],
+        long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    Create( parent, id, pos, size, n, choices, style, validator, name );
+}
+
+
+wxChoice::wxChoice( wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    Create( parent, id, pos, size, choices, style, validator, name );
+}
+
+
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    return Create( parent, id, pos, size, choices.size(), &choices[ 0 ], style,
+        validator, name );
+}
+
+
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        int n, const wxString choices[],
+        long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    m_qtComboBox = new wxQtChoice( parent, this );
+
+    while ( n-- > 0 )
+        m_qtComboBox->addItem( wxQtConvertString( *choices++ ));
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+wxSize wxChoice::DoGetBestSize() const
+{
+    wxSize basesize = wxChoiceBase::DoGetBestSize();
+    wxSize size = wxControl::DoGetBestSize();
+    // mix calculated size by wx base prioritizing qt hint (max):
+    if (size.GetWidth() < basesize.GetWidth())
+        size.SetWidth(basesize.GetWidth());
+    if (size.GetHeight() < basesize.GetHeight())
+        size.SetHeight(basesize.GetHeight());
+    return size;
+}
+
+
+unsigned wxChoice::GetCount() const
+{
+    return m_qtComboBox->count();
+}
+
+wxString wxChoice::GetString(unsigned int n) const
+{
+    return wxQtConvertString( m_qtComboBox->itemText(n) );
+}
+
+void wxChoice::SetString(unsigned int n, const wxString& s)
+{
+    m_qtComboBox->setItemText(n, wxQtConvertString(s));
+}
+
+
+void wxChoice::SetSelection(int n)
+{
+    m_qtComboBox->setCurrentIndex(n);
+}
+
+int wxChoice::GetSelection() const
+{
+    return m_qtComboBox->currentIndex();
+}
+
+
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                  unsigned int pos,
+                  void **clientData,
+                  wxClientDataType type)
+{
+    InvalidateBestSize();
+    int n = DoInsertItemsInLoop(items, pos, clientData, type);
+    return n;
+}
+
+int wxChoice::DoInsertOneItem(const wxString& item, unsigned int pos)
+{
+    m_qtComboBox->insertItem(pos, wxQtConvertString(item));
+    return pos;
+}
+
+void wxChoice::DoSetItemClientData(unsigned int n, void *clientData)
+{
+    QVariant variant = qVariantFromValue(clientData);
+    m_qtComboBox->setItemData(n, variant);
+}
+
+void *wxChoice::DoGetItemClientData(unsigned int n) const
+{
+    QVariant variant = m_qtComboBox->itemData(n);
+    return variant.value<void *>();
+}
+
+
+void wxChoice::DoClear()
+{
+    m_qtComboBox->clear();
+}
+
+void wxChoice::DoDeleteOneItem(unsigned int pos)
+{
+    m_qtComboBox->removeItem(pos);
+}
+
+QComboBox *wxChoice::GetHandle() const
+{
+    return m_qtComboBox;
+}
diff --git a/src/qt/clipbrd.cpp b/src/qt/clipbrd.cpp
new file mode 100644
index 0000000000..438ee99f12
--- /dev/null
+++ b/src/qt/clipbrd.cpp
@@ -0,0 +1,184 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/toolbar.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/clipbrd.h"
+#include "wx/scopedarray.h"
+#include "wx/scopeguard.h"
+#include "wx/qt/private/converter.h"
+
+#include <QClipboard>
+
+// ----------------------------------------------------------------------------
+// wxClipboard ctor/dtor
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+
+#define QtClipboard  QApplication::clipboard()
+typedef wxScopedArray<wxDataFormat> wxDataFormatArray;
+
+class QtClipBoardSignalHandler : public QObject
+{
+public:
+    QtClipBoardSignalHandler(wxClipboard *clipboard)
+        : m_clipboard(clipboard)
+    {
+        connect(QtClipboard, &QClipboard::changed, this, &QtClipBoardSignalHandler::changed);
+    }
+
+private:
+    void changed( QClipboard::Mode mode)
+    {
+        if(mode != m_clipboard->Mode() || !m_clipboard->m_sink)
+            return;
+
+        wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
+        event->SetEventObject( m_clipboard );
+        m_clipboard->m_sink->QueueEvent( event );
+        m_clipboard->m_sink.Release();
+    }
+
+    wxClipboard *m_clipboard;
+};
+
+wxClipboard::wxClipboard()
+{
+    m_SignalHandler = new QtClipBoardSignalHandler(this);
+    m_open = false;
+}
+
+wxClipboard::~wxClipboard()
+{
+    delete m_SignalHandler;
+}
+
+bool wxClipboard::Open()
+{
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );
+
+    m_open = true;
+
+    return true;
+}
+
+void wxClipboard::Close()
+{
+    wxCHECK_RET( m_open, wxT("clipboard not open") );
+
+    m_open = false;
+}
+
+bool wxClipboard::IsOpened() const
+{
+    return m_open;
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{
+    QMimeData *MimeData = new QMimeData;
+    const size_t count = data->GetFormatCount();
+    wxDataFormatArray formats(count);
+    data->GetAllFormats(formats.get());
+
+    // how to add timestamp?
+
+    // Unfortunately I cannot find a way to use the qt clipboard with 
+    // a callback to select the data type, so I must copy it all here
+
+    for ( size_t i = 0; i < count; i++ )
+    {
+        const wxDataFormat format(formats[i]);
+
+        int size = data->GetDataSize( format );
+        if ( !size )
+            continue;
+
+        QByteArray bytearray(size, 0);
+        data->GetDataHere(format, bytearray.data());
+        MimeData->setData(format.m_MimeType, bytearray);
+    }
+
+    delete data;
+
+    QtClipboard->setMimeData(MimeData, (QClipboard::Mode)Mode());
+
+    return true;
+}
+
+bool wxClipboard::SetData( wxDataObject *data )
+{
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
+
+    Clear();
+
+    return AddData( data );
+}
+
+bool wxClipboard::GetData( wxDataObject& data )
+{
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+
+    const QMimeData *MimeData = QtClipboard->mimeData( (QClipboard::Mode)Mode() );
+    const size_t count = data.GetFormatCount(wxDataObject::Set);
+    wxDataFormatArray formats(count);
+    data.GetAllFormats(formats.get(), wxDataObject::Set);
+
+    for ( size_t i = 0; i < count; i++ )
+    {
+        const wxDataFormat format(formats[i]);
+        
+        // is this format supported by clipboard ?
+        if( !MimeData->hasFormat(format.m_MimeType) )
+            continue;
+
+        wxTextDataObject *textdata = dynamic_cast<wxTextDataObject*>(&data);
+        if(textdata)
+            textdata->SetText(wxQtConvertString(MimeData->text()));
+        else
+        {
+            QByteArray bytearray = MimeData->data( format.m_MimeType ).data();
+            data.SetData(format, bytearray.size(), bytearray.constData());
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+void wxClipboard::Clear()
+{
+    QtClipboard->clear( (QClipboard::Mode)Mode() );
+}
+
+bool wxClipboard::IsSupported( const wxDataFormat& format )
+{
+    const QMimeData *data = QtClipboard->mimeData( (QClipboard::Mode)Mode() );
+    return data->hasFormat(format.m_MimeType);
+}
+
+bool wxClipboard::IsSupportedAsync(wxEvtHandler *sink)
+{
+    if (m_sink.get())
+        return false;  // currently busy, come back later
+
+    wxCHECK_MSG( sink, false, wxT("no sink given") );
+
+    m_sink = sink;
+
+    return true;
+}
+
+int wxClipboard::Mode()
+{
+    return m_usePrimary ? QClipboard::Selection : QClipboard::Clipboard;
+}
diff --git a/src/qt/clrpicker.cpp b/src/qt/clrpicker.cpp
new file mode 100644
index 0000000000..d1ef69c25e
--- /dev/null
+++ b/src/qt/clrpicker.cpp
@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/clrpicker.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/clrpicker.h"
+
+wxColourPickerWidget::wxColourPickerWidget()
+{
+}
+
+wxColourPickerWidget::wxColourPickerWidget(wxWindow *parent,
+               wxWindowID id,
+               const wxColour& initial,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style,
+               const wxValidator& validator,
+               const wxString& name )
+{
+    Create( parent, id, initial, pos, size, style, validator, name );
+}
+
+
+bool wxColourPickerWidget::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxColour& initial,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name )
+{
+    return wxGenericColourButton::Create( parent, id, initial, pos, size, style, validator, name );
+}
+
+
+void wxColourPickerWidget::UpdateColour()
+{
+    wxGenericColourButton::UpdateColour();
+}
+
diff --git a/src/qt/colordlg.cpp b/src/qt/colordlg.cpp
new file mode 100644
index 0000000000..3e4dda17a2
--- /dev/null
+++ b/src/qt/colordlg.cpp
@@ -0,0 +1,49 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/colordlg.cpp
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/qt/private/winevent.h"
+#include "wx/colordlg.h"
+
+class wxQtColorDialog : public wxQtEventSignalHandler< QColorDialog, wxDialog >
+{
+public:
+    wxQtColorDialog( wxWindow *parent, wxDialog *handler)
+        : wxQtEventSignalHandler(parent, handler)
+        { }
+};
+
+bool wxColourDialog::Create(wxWindow *parent, wxColourData *data )
+{
+    m_qtWindow = new wxQtColorDialog( parent, this );
+
+    if(data)
+        m_data = *data;
+
+    if ( m_data.GetChooseFull() )
+    {
+        for (int i=0; i<wxColourData::NUM_CUSTOM; i++)
+            QColorDialog::setCustomColor(i, m_data.GetCustomColour(i).GetHandle());
+    }
+
+    GetHandle()->setCurrentColor(m_data.GetColour().GetHandle());
+
+    return wxTopLevelWindow::Create( parent, wxID_ANY, "");
+}
+
+wxColourData &wxColourDialog::GetColourData()
+{
+    for (int i=0; i<wxColourData::NUM_CUSTOM; i++)
+        m_data.SetCustomColour(i, GetHandle()->customColor(i));
+    
+    m_data.SetColour(GetHandle()->currentColor());
+    
+    return m_data;
+}
+
diff --git a/src/qt/colour.cpp b/src/qt/colour.cpp
new file mode 100644
index 0000000000..4aed991735
--- /dev/null
+++ b/src/qt/colour.cpp
@@ -0,0 +1,25 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/colour.h
+// Purpose:     wxColour class implementation for wxQt
+// Author:      Peter Most, Kolya Kosenko
+// Created:     2010-05-12
+// Copyright:   (c) Peter Most
+//              (C) 2010 Kolya Kosenko
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+#include "wx/qt/private/utils.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+int wxColour::GetPixel() const
+{
+    wxMISSING_IMPLEMENTATION( "wxColour::GetPixel" );
+    return 0;
+}
+
+#include "wx/colour.h"
diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp
new file mode 100644
index 0000000000..aee4130860
--- /dev/null
+++ b/src/qt/combobox.cpp
@@ -0,0 +1,161 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/combobox.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/combobox.h"
+#include "wx/window.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QComboBox>
+
+class wxQtComboBox : public wxQtEventSignalHandler< QComboBox, wxComboBox >
+{
+public:
+    wxQtComboBox( wxWindow *parent, wxComboBox *handler );
+
+private:
+    void activated(int index);
+    void editTextChanged(const QString &text);
+};
+
+wxQtComboBox::wxQtComboBox( wxWindow *parent, wxComboBox *handler )
+    : wxQtEventSignalHandler< QComboBox, wxComboBox >( parent, handler )
+{
+    setEditable( true );
+    connect(this, static_cast<void (QComboBox::*)(int index)>(&QComboBox::activated),
+            this, &wxQtComboBox::activated);
+    connect(this, &QComboBox::editTextChanged,
+            this, &wxQtComboBox::editTextChanged);
+}
+
+void wxQtComboBox::activated(int WXUNUSED(index))
+{
+    wxComboBox *handler = GetHandler();
+    if ( handler )
+        handler->SendSelectionChangedEvent(wxEVT_COMBOBOX);
+}
+
+void wxQtComboBox::editTextChanged(const QString &text)
+{
+    wxComboBox *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_TEXT, handler->GetId() );
+        event.SetString( wxQtConvertString( text ) );
+        EmitEvent( event );
+    }
+}
+
+
+wxComboBox::wxComboBox()
+{
+}
+
+
+wxComboBox::wxComboBox(wxWindow *parent,
+           wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           int n, const wxString choices[],
+           long style,
+           const wxValidator& validator,
+           const wxString& name )
+{
+    Create( parent, id, value, pos, size, n, choices, style, validator, name );
+}
+
+
+wxComboBox::wxComboBox(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style,
+           const wxValidator& validator,
+           const wxString& name )
+{
+    Create( parent, id, value, pos, size, choices, style, validator, name );
+}
+
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+            const wxString& value,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style,
+            const wxValidator& validator,
+            const wxString& name )
+{
+    return Create( parent, id, value, pos, size, choices.size(), &choices[ 0 ],
+        style, validator, name );
+}
+
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+            const wxString& value,
+            const wxPoint& pos,
+            const wxSize& size,
+            int n, const wxString choices[],
+            long style,
+            const wxValidator& validator,
+            const wxString& name )
+{
+    m_qtComboBox = new wxQtComboBox( parent, this );
+    while ( n-- > 0 )
+        m_qtComboBox->addItem( wxQtConvertString( *choices++ ));
+    m_qtComboBox->setEditText( wxQtConvertString( value ));
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+wxString wxComboBox::DoGetValue() const
+{
+    return wxQtConvertString( m_qtComboBox->currentText() );
+}
+
+void wxComboBox::Popup()
+{
+     GetHandle()->showPopup();
+}
+
+void wxComboBox::Dismiss()
+{
+    GetHandle()->hidePopup();
+}
+
+void wxComboBox::SetSelection( long from, long to )
+{
+    // SelectAll uses -1 to -1, adjust for qt:
+    if (from == -1 && to == -1)
+    {
+        from = 0;
+        to = GetValue().length();
+    }
+    // use the inner text entry widget (note that can be null if not editable)
+    if ( m_qtComboBox->lineEdit() != NULL )
+        m_qtComboBox->lineEdit()->setSelection(from, to);
+}
+
+void wxComboBox::GetSelection(long* from, long* to) const
+{
+    // use the inner text entry widget (note that can be null if not editable)
+    if ( m_qtComboBox->lineEdit() != NULL )
+    {
+        *from = m_qtComboBox->lineEdit()->selectionStart();
+        if ( *from >= 0 )
+        {
+            *to = *from + m_qtComboBox->lineEdit()->selectedText().length();
+            return;
+        }
+    }
+    // No selection or text control, call base for default behaviour:
+    wxTextEntry::GetSelection(from, to);
+}
diff --git a/src/qt/control.cpp b/src/qt/control.cpp
new file mode 100644
index 0000000000..f9c29d6689
--- /dev/null
+++ b/src/qt/control.cpp
@@ -0,0 +1,74 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/control.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/control.h"
+#include "wx/qt/private/converter.h"
+
+IMPLEMENT_DYNAMIC_CLASS( wxControl, wxControlBase )
+
+wxControl::wxControl()
+{
+}
+
+wxControl::wxControl(wxWindow *parent, wxWindowID id,
+         const wxPoint& pos,
+         const wxSize& size, long style,
+         const wxValidator& validator,
+         const wxString& name )
+{
+    Create( parent, id, pos, size, style, validator, name );
+}
+
+
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size, long style,
+        const wxValidator& validator,
+        const wxString& name )
+{
+    bool isCreated = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return isCreated;
+}
+
+bool wxControl::QtCreateControl( wxWindow *parent, wxWindowID id,
+    const wxPoint &pos, const wxSize &size, long style,
+    const wxValidator &validator, const wxString &name )
+{
+    // The Qt widget has been created without a position/size so move/resize it:
+
+    wxSize bestSize = GetBestSize();
+    int width = ( size.GetWidth() == wxDefaultCoord ) ? bestSize.GetWidth() : size.GetWidth();
+    int height = ( size.GetHeight() == wxDefaultCoord ) ? bestSize.GetHeight() : size.GetHeight();
+
+    DoMoveWindow( pos.x, pos.y, width, height );
+
+    // Let Qt handle the background:
+    SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+    PostCreation(false);
+
+    return CreateControl( parent, id, pos, size, style, validator, name );
+}
+
+wxSize wxControl::DoGetBestSize() const
+{
+    wxSize minsize = wxQtConvertSize( GetHandle()->minimumSizeHint() );
+    wxSize size = wxQtConvertSize( GetHandle()->sizeHint() );
+    // best effort to ensure a correct size (note that some qt controls implement just one or both size hints)
+    if (size.GetWidth() < minsize.GetWidth())
+        size.SetWidth(minsize.GetWidth());
+    if (size.GetHeight() < minsize.GetHeight())
+        size.SetHeight(minsize.GetHeight());
+    return size;
+}
diff --git a/src/qt/converter.cpp b/src/qt/converter.cpp
new file mode 100644
index 0000000000..ed23035156
--- /dev/null
+++ b/src/qt/converter.cpp
@@ -0,0 +1,402 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/converter.cpp
+// Author:      Peter Most, Kolya Kosenko
+// Copyright:   (c) Peter Most
+//              (c) 2010 Kolya Kosenko
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/gdicmn.h"
+#include "wx/gdicmn.h"
+
+#include <QtCore/QRect>
+#include <QtCore/QString>
+#include <QtGui/QFont>
+#include <QtCore/QSize>
+
+#if wxUSE_DATETIME
+    #include "wx/datetime.h"
+    #include <QtCore/QDate>
+#endif // wxUSE_DATETIME
+
+wxPoint wxQtConvertPoint( const QPoint &point )
+{
+    if (point.isNull())
+        return wxDefaultPosition;
+
+    return wxPoint( point.x(), point.y() );
+}
+
+QPoint wxQtConvertPoint( const wxPoint &point )
+{
+    if (point == wxDefaultPosition)
+        return QPoint();
+
+    return QPoint( point.x, point.y );
+}
+
+
+QRect wxQtConvertRect( const wxRect &rect )
+{
+    return QRect( rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight() );
+}
+
+wxRect wxQtConvertRect( const QRect &rect )
+{
+    return wxRect( rect.x(), rect.y(), rect.width(), rect.height() );
+}
+
+// TODO: Check whether QString::toStdString/QString::toStdWString might be faster
+
+wxString wxQtConvertString( const QString &str )
+{
+    return wxString( str.toUtf8().data(), wxConvUTF8 );
+}
+
+QString  wxQtConvertString( const wxString &str )
+{
+    return QString( str.utf8_str() );
+}
+
+
+
+
+#if wxUSE_DATETIME
+
+wxDateTime wxQtConvertDate(const QDate& date)
+{
+    if ( !date.isNull() )
+        return wxDateTime(date.day(),
+            static_cast<wxDateTime::Month>(date.month() - 1),
+            date.year(), 0, 0, 0, 0);
+    else
+        return wxDateTime();
+}
+
+QDate wxQtConvertDate(const wxDateTime& date)
+{
+    if ( date.IsValid() )
+        return QDate(date.GetYear(), date.GetMonth() + 1, date.GetDay());
+    else
+        return QDate();
+}
+
+#endif // wxUSE_DATETIME
+
+wxSize wxQtConvertSize( const QSize  &size )
+{
+    if (size.isNull())
+        return wxDefaultSize;
+
+    return wxSize(size.width(), size.height());
+}
+
+QSize  wxQtConvertSize( const wxSize &size )
+{
+    if (size == wxDefaultSize)
+        return QSize();
+
+    return QSize(size.GetWidth(), size.GetHeight());
+}
+
+Qt::Orientation wxQtConvertOrientation( long style, wxOrientation defaultOrientation )
+{
+    if (( style & ( wxHORIZONTAL | wxVERTICAL )) == 0 )
+        style |= defaultOrientation;
+
+    switch ( style & ( wxHORIZONTAL | wxVERTICAL ))
+    {
+        case wxHORIZONTAL:
+            return Qt::Horizontal;
+
+        case wxVERTICAL:
+            return Qt::Vertical;
+    }
+    wxFAIL_MSG( "Unreachable code!" );
+    return static_cast< Qt::Orientation >( -1 );
+}
+
+
+wxOrientation wxQtConvertOrientation( Qt::Orientation qtOrientation )
+{
+    switch ( qtOrientation )
+    {
+        case Qt::Horizontal:
+            return wxHORIZONTAL;
+
+        case Qt::Vertical:
+            return wxVERTICAL;
+    }
+    wxFAIL_MSG( "Unreachable code!" );
+    return static_cast< wxOrientation >( -1 );
+}
+
+/* Auxiliar function for key events. Returns the wx keycode for a qt one.
+ * The event is needed to check it flags (numpad key or not) */
+wxKeyCode wxQtConvertKeyCode( int key, const Qt::KeyboardModifiers modifiers )
+{
+    /* First treat common ranges and then handle specific values
+     * The macro takes Qt first and last codes and the first wx code
+     * to make the conversion */
+    #define WXQT_KEY_GROUP( firstQT, lastQT, firstWX ) \
+        if ( key >= firstQT && key <= lastQT ) \
+            return (wxKeyCode)(key - (firstQT - firstWX));
+
+    if ( modifiers.testFlag( Qt::KeypadModifier ) )
+    {
+        // This is a numpad event
+        WXQT_KEY_GROUP( Qt::Key_0, Qt::Key_9, WXK_NUMPAD0 )
+        WXQT_KEY_GROUP( Qt::Key_F1, Qt::Key_F4, WXK_NUMPAD_F1 )
+        WXQT_KEY_GROUP( Qt::Key_Left, Qt::Key_Down, WXK_NUMPAD_LEFT )
+
+        // * + , - . /
+        WXQT_KEY_GROUP( Qt::Key_Asterisk, Qt::Key_Slash, WXK_NUMPAD_MULTIPLY )
+
+        switch (key)
+        {
+            case Qt::Key_Space:
+                return WXK_NUMPAD_SPACE;
+            case Qt::Key_Tab:
+                return WXK_NUMPAD_TAB;
+            case Qt::Key_Enter:
+                return WXK_NUMPAD_ENTER;
+            case Qt::Key_Home:
+                return WXK_NUMPAD_HOME;
+            case Qt::Key_PageUp:
+                return WXK_NUMPAD_PAGEUP;
+            case Qt::Key_PageDown:
+                return WXK_NUMPAD_PAGEDOWN;
+            case Qt::Key_End:
+                return WXK_NUMPAD_END;
+            case Qt::Key_Insert:
+                return WXK_NUMPAD_INSERT;
+            case Qt::Key_Delete:
+                return WXK_NUMPAD_DELETE;
+            case Qt::Key_Clear:
+                return WXK_NUMPAD_BEGIN;
+            case Qt::Key_Equal:
+                return WXK_NUMPAD_EQUAL;
+        }
+
+        // All other possible numpads button have no equivalent in wx
+        return (wxKeyCode)0;
+    }
+
+    // ASCII (basic and extended) values are the same in Qt and wx
+    WXQT_KEY_GROUP( 32, 255, 32 );
+
+    // Arrow keys
+    WXQT_KEY_GROUP( Qt::Key_Left, Qt::Key_Down, WXK_LEFT )
+
+    // F-keys (Note: Qt has up to F35, wx up to F24)
+    WXQT_KEY_GROUP( Qt::Key_F1, Qt::Key_F24, WXK_F1 )
+
+    // * + , - . /
+    WXQT_KEY_GROUP( Qt::Key_Asterisk, Qt::Key_Slash, WXK_MULTIPLY )
+
+    // Special keys in wx. Seems most appropriate to map to LaunchX
+    WXQT_KEY_GROUP( Qt::Key_Launch0, Qt::Key_LaunchF, WXK_SPECIAL1 )
+
+    // All other cases
+    switch ( key )
+    {
+        case Qt::Key_Backspace:
+            return WXK_BACK;
+        case Qt::Key_Tab:
+            return WXK_TAB;
+        case Qt::Key_Return:
+            return WXK_RETURN;
+        case Qt::Key_Escape:
+            return WXK_ESCAPE;
+        case Qt::Key_Cancel:
+            return WXK_CANCEL;
+        case Qt::Key_Clear:
+            return WXK_CLEAR;
+        case Qt::Key_Shift:
+            return WXK_SHIFT;
+        case Qt::Key_Alt:
+            return WXK_ALT;
+        case Qt::Key_Control:
+            return WXK_CONTROL;
+        case Qt::Key_Menu:
+            return WXK_MENU;
+        case Qt::Key_Pause:
+            return WXK_PAUSE;
+        case Qt::Key_CapsLock:
+            return WXK_CAPITAL;
+        case Qt::Key_End:
+            return WXK_END;
+        case Qt::Key_Home:
+            return WXK_HOME;
+        case Qt::Key_Select:
+            return WXK_SELECT;
+        case Qt::Key_SysReq:
+            return WXK_PRINT;
+        case Qt::Key_Execute:
+            return WXK_EXECUTE;
+        case Qt::Key_Insert:
+            return WXK_INSERT;
+        case Qt::Key_Help:
+            return WXK_HELP;
+        case Qt::Key_NumLock:
+            return WXK_NUMLOCK;
+        case Qt::Key_ScrollLock:
+            return WXK_SCROLL;
+        case Qt::Key_PageUp:
+            return WXK_PAGEUP;
+        case Qt::Key_PageDown:
+            return WXK_PAGEDOWN;
+        case Qt::Key_Meta:
+            return WXK_WINDOWS_LEFT;
+    }
+
+    // Missing wx-codes: WXK_START, WXK_LBUTTON, WXK_RBUTTON, WXK_MBUTTON
+    // WXK_SPECIAL(17-20), WXK_WINDOWS_RIGHT, WXK_WINDOWS_MENU, WXK_COMMAND
+    // WXK_SNAPSHOT
+
+    return (wxKeyCode)0;
+
+    #undef WXQT_KEY_GROUP
+}
+
+void wxQtFillKeyboardModifiers( Qt::KeyboardModifiers modifiers, wxKeyboardState *state )
+{
+    state->SetControlDown( modifiers.testFlag( Qt::ControlModifier ) );
+    state->SetShiftDown( modifiers.testFlag( Qt::ShiftModifier ) );
+    state->SetAltDown( modifiers.testFlag( Qt::AltModifier ) );
+    state->SetMetaDown( modifiers.testFlag( Qt::MetaModifier ) );
+}
+
+
+int wxQtConvertKeyCode( int key, int WXUNUSED(modifiers), Qt::KeyboardModifiers &qtmodifiers )
+{
+    /* First treat common ranges and then handle specific values
+     * The macro takes Qt first and last codes and the first wx code
+     * to make the conversion */
+    #define QTWX_KEY_GROUP( firstWX, lastWX, firstQT ) \
+        if ( key >= firstWX && key <= lastWX ) \
+            return (int)(key - (firstWX - firstQT));
+
+    qtmodifiers |= Qt::KeypadModifier;
+    // This is a numpad event
+    QTWX_KEY_GROUP( WXK_NUMPAD0, WXK_NUMPAD9, Qt::Key_0 )
+    QTWX_KEY_GROUP( WXK_NUMPAD_F1, WXK_NUMPAD_F4, Qt::Key_F1 )
+    QTWX_KEY_GROUP( WXK_NUMPAD_LEFT, WXK_NUMPAD_DOWN, Qt::Key_Left )
+
+    // * + , - . /
+    QTWX_KEY_GROUP( WXK_NUMPAD_MULTIPLY, WXK_NUMPAD_DIVIDE, Qt::Key_Asterisk )
+
+    switch (key)
+    {
+        case WXK_NUMPAD_SPACE:
+            return Qt::Key_Space;
+        case WXK_NUMPAD_TAB:
+            return Qt::Key_Tab;
+        case WXK_NUMPAD_ENTER:
+            return Qt::Key_Enter;
+        case WXK_NUMPAD_HOME:
+            return Qt::Key_Home;
+        case WXK_NUMPAD_PAGEUP:
+            return Qt::Key_PageUp;
+        case WXK_NUMPAD_PAGEDOWN:
+            return Qt::Key_PageDown;
+        case WXK_NUMPAD_END:
+            return Qt::Key_End;
+        case WXK_NUMPAD_INSERT:
+            return Qt::Key_Insert;
+        case WXK_NUMPAD_DELETE:
+            return Qt::Key_Delete;
+        case WXK_NUMPAD_BEGIN:
+            return Qt::Key_Clear;
+        case WXK_NUMPAD_EQUAL:
+            return Qt::Key_Equal;
+    }
+
+    qtmodifiers &= ~Qt::KeypadModifier;
+
+    // ASCII letters are only supported in uppercase in Qt
+    QTWX_KEY_GROUP( 0x61, 0x7a, 0x41 );
+
+    // ASCII (basic) values are the same in Qt and wx
+    QTWX_KEY_GROUP( 32, 126, 32 );
+
+    // ASCII (extended) values are the same in Qt but has holes
+    // see qasciikey.cpp char QTest::keyToAscii(Qt::Key key)
+    // WARNING: not translated as there is an assert in keyToAscii
+
+    // Arrow keys
+    QTWX_KEY_GROUP( WXK_LEFT, WXK_DOWN, Qt::Key_Left )
+
+    // F-keys (Note: Qt has up to F35, wx up to F24)
+    QTWX_KEY_GROUP( WXK_F1, WXK_F24, Qt::Key_F1 )
+
+    // * + , - . /
+    QTWX_KEY_GROUP( WXK_MULTIPLY, WXK_DIVIDE, Qt::Key_Asterisk )
+
+    // Special keys in wx. Seems most appropriate to map to LaunchX
+    QTWX_KEY_GROUP( WXK_SPECIAL1, WXK_SPECIAL20, Qt::Key_Launch0 )
+
+    // All other cases
+    switch ( key )
+    {
+        case WXK_BACK:
+            return Qt::Key_Backspace;
+        case WXK_TAB:
+            return Qt::Key_Tab;
+        case WXK_RETURN:
+            return Qt::Key_Return;
+        case WXK_ESCAPE:
+            return Qt::Key_Escape;
+        case WXK_CANCEL:
+            return Qt::Key_Cancel;
+        case Qt::Key_Clear:
+            return WXK_CLEAR;
+        case WXK_SHIFT:
+            return Qt::Key_Shift;
+        case WXK_ALT:
+            return Qt::Key_Alt;
+        case WXK_CONTROL:
+            return Qt::Key_Control;
+        case WXK_MENU:
+            return Qt::Key_Menu;
+        case WXK_PAUSE:
+            return Qt::Key_Pause;
+        case WXK_CAPITAL:
+            return Qt::Key_CapsLock;
+        case WXK_END:
+            return Qt::Key_End;
+        case WXK_HOME:
+            return Qt::Key_Home;
+        case WXK_SELECT:
+            return Qt::Key_Select;
+        case WXK_PRINT:
+            return Qt::Key_SysReq;
+        case WXK_EXECUTE:
+            return Qt::Key_Execute;
+        case WXK_INSERT:
+            return Qt::Key_Insert;
+        case WXK_HELP:
+            return Qt::Key_Help;
+        case WXK_NUMLOCK:
+            return Qt::Key_NumLock;
+        case WXK_SCROLL:
+            return Qt::Key_ScrollLock;
+        case WXK_PAGEUP:
+            return Qt::Key_PageUp;
+        case WXK_PAGEDOWN:
+            return Qt::Key_PageDown;
+        case WXK_WINDOWS_LEFT:
+            return Qt::Key_Meta;
+    }
+
+    // Missing wx-codes: WXK_START, WXK_LBUTTON, WXK_RBUTTON, WXK_MBUTTON
+    // WXK_SPECIAL(17-20), WXK_WINDOWS_RIGHT, WXK_WINDOWS_MENU, WXK_COMMAND
+    // WXK_SNAPSHOT
+
+    return (wxKeyCode)0;
+
+    #undef QTWX_KEY_GROUP
+}
diff --git a/src/qt/ctrlsub.cpp b/src/qt/ctrlsub.cpp
new file mode 100644
index 0000000000..5202368811
--- /dev/null
+++ b/src/qt/ctrlsub.cpp
@@ -0,0 +1,16 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/ctrlsub.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/ctrlsub.h"
+
+wxControlWithItems::wxControlWithItems()
+{
+}
+
diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp
new file mode 100644
index 0000000000..e015ee3ad4
--- /dev/null
+++ b/src/qt/cursor.cpp
@@ -0,0 +1,140 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/cursor.cpp
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+#include "wx/cursor.h"
+
+#include <QApplication>
+#include <QBitmap>
+
+void wxSetCursor(const wxCursor& cursor)
+{
+    if (cursor.m_qtCursor.shape() == Qt::ArrowCursor)
+        QApplication::restoreOverrideCursor();
+    else
+        QApplication::setOverrideCursor(cursor.m_qtCursor);
+}
+
+void wxBeginBusyCursor(const wxCursor *cursor)
+{
+    QApplication::setOverrideCursor(cursor->m_qtCursor);
+}
+
+bool wxIsBusy()
+{
+    return QApplication::overrideCursor() != 0;
+}
+
+void wxEndBusyCursor()
+{
+    QApplication::restoreOverrideCursor();
+}
+
+
+IMPLEMENT_DYNAMIC_CLASS( wxCursor, wxGDIObject )
+
+wxCursor::wxCursor( const wxCursor &cursor )
+{
+    m_qtCursor = cursor.m_qtCursor;
+}
+
+wxCursor::wxCursor(const wxString& filename,
+                   wxBitmapType kind,
+                   int hotSpotX,
+                   int hotSpotY)
+{
+    switch ( kind )
+    {
+        case wxBITMAP_TYPE_ICO:
+            m_qtCursor = QCursor(
+                            *wxBitmap(filename, wxBITMAP_TYPE_ICO).GetHandle(),
+                            hotSpotX, hotSpotY );
+            break;
+        case wxBITMAP_TYPE_BMP:
+            m_qtCursor = QCursor(
+                            *wxBitmap(filename, wxBITMAP_TYPE_ICO).GetHandle(),
+                            hotSpotX, hotSpotY );
+            break;
+        default:
+            wxLogError( wxT("unknown cursor resource type '%d'"), kind );
+    }
+}
+
+void wxCursor::InitFromStock( wxStockCursor cursorId )
+{
+    Qt::CursorShape qt_cur;
+    switch (cursorId)
+    {
+    case wxCURSOR_BLANK:
+    {
+        m_qtCursor = QBitmap();
+        return;
+    }
+//    case wxCURSOR_ARROW: 
+    case wxCURSOR_DEFAULT:     qt_cur = Qt::ArrowCursor;    break;
+//    case wxCURSOR_RIGHT_ARROW:
+    case wxCURSOR_HAND:        qt_cur = Qt::OpenHandCursor; break;
+    case wxCURSOR_CROSS:       qt_cur = Qt::CrossCursor;    break;
+    case wxCURSOR_SIZEWE:      qt_cur = Qt::SizeHorCursor;  break;
+    case wxCURSOR_SIZENS:      qt_cur = Qt::SizeVerCursor;  break;
+    case wxCURSOR_ARROWWAIT:   qt_cur = Qt::BusyCursor;     break;
+    case wxCURSOR_WATCH:
+    case wxCURSOR_WAIT:        qt_cur = Qt::WaitCursor;     break;
+    case wxCURSOR_SIZING:      qt_cur = Qt::SizeAllCursor;  break;
+//    case wxCURSOR_SPRAYCAN:
+    case wxCURSOR_IBEAM:       qt_cur = Qt::IBeamCursor;    break;
+//    case wxCURSOR_PENCIL:
+    case wxCURSOR_NO_ENTRY:    qt_cur = Qt::ForbiddenCursor; break;
+    case wxCURSOR_SIZENWSE:    qt_cur = Qt::SizeFDiagCursor; break;
+    case wxCURSOR_SIZENESW:    qt_cur = Qt::SizeBDiagCursor; break;
+    case wxCURSOR_QUESTION_ARROW: qt_cur = Qt::WhatsThisCursor; break;
+/*  case wxCURSOR_PAINT_BRUSH:
+    case wxCURSOR_MAGNIFIER:
+    case wxCURSOR_CHAR:
+    case wxCURSOR_LEFT_BUTTON: 
+    case wxCURSOR_MIDDLE_BUTTON:
+    case wxCURSOR_RIGHT_BUTTON:
+    case wxCURSOR_BULLSEYE:
+    case wxCURSOR_POINT_LEFT:
+    case wxCURSOR_POINT_RIGHT:
+    case wxCURSOR_DOUBLE_ARROW:
+    case wxCURSOR_CROSS_REVERSE:
+    case wxCURSOR_BASED_ARROW_DOWN:
+    case wxCURSOR_BASED_ARROW_UP:   qt_cur = Qt::UpArrowCursor; break;
+*/
+    default:
+        wxFAIL_MSG(wxT("unsupported cursor type"));
+        // will use the standard one
+        break;
+    }
+
+    m_qtCursor.setShape(qt_cur);
+}
+
+#if wxUSE_IMAGE
+
+void wxCursor::InitFromImage( const wxImage & image )
+{
+    m_qtCursor = *wxBitmap(image).GetHandle();
+}
+
+#endif // wxUSE_IMAGE
+
+wxGDIRefData *wxCursor::CreateGDIRefData() const
+{
+    //return new wxCursorRefData;
+    return NULL;
+}
+
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * data) const
+{
+//    return new wxCursorRefData(data->bitmap());
+    return NULL;
+
+}
diff --git a/src/qt/dataobj.cpp b/src/qt/dataobj.cpp
new file mode 100644
index 0000000000..b406310f30
--- /dev/null
+++ b/src/qt/dataobj.cpp
@@ -0,0 +1,182 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dataform.h
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/utils.h"
+#include "wx/dataobj.h"
+
+
+wxDataFormat::wxDataFormat()
+{
+}
+
+static QString DataFormatIdToMimeType( wxDataFormatId formatId )
+{
+    switch(formatId) {
+        case wxDF_TEXT: return "text/plain";
+        case wxDF_BITMAP: return "image/bmp";
+        case wxDF_TIFF: return "image/tiff";
+        case wxDF_WAVE: return "audio/x-wav";
+        case wxDF_UNICODETEXT: return "text/plain";
+        case wxDF_HTML: return "text/html";
+        case wxDF_METAFILE:
+        case wxDF_SYLK:
+        case wxDF_DIF:
+        case wxDF_OEMTEXT:
+        case wxDF_DIB:
+        case wxDF_PALETTE:
+        case wxDF_PENDATA:
+        case wxDF_RIFF:
+        case wxDF_ENHMETAFILE:
+        case wxDF_FILENAME:
+        case wxDF_LOCALE:
+        case wxDF_PRIVATE:
+        case wxDF_INVALID:
+        case wxDF_MAX:
+            break;
+    }
+    return "";
+}
+
+wxDataFormat::wxDataFormat( wxDataFormatId formatId )
+{
+    m_MimeType = DataFormatIdToMimeType(formatId);
+}
+
+wxDataFormat::wxDataFormat(const wxString &id)
+{
+    m_MimeType = wxQtConvertString(id);
+}
+
+wxDataFormat::wxDataFormat(const wxChar *id)
+{
+    m_MimeType = wxQtConvertString(id);
+}
+
+wxDataFormat::wxDataFormat(const QString &id)
+{
+    m_MimeType = id;
+}
+
+void wxDataFormat::SetId( const wxChar *id )
+{
+    m_MimeType = wxQtConvertString(id);
+}
+
+void wxDataFormat::SetId( const wxString& id )
+{
+    m_MimeType = wxQtConvertString(id);
+}
+
+wxString wxDataFormat::GetId() const
+{
+    return wxQtConvertString(m_MimeType);
+}
+
+wxDataFormatId wxDataFormat::GetType() const
+{
+    wxMISSING_IMPLEMENTATION( "wxDataFormat GetType" );
+    return wxDataFormatId();
+}
+
+void wxDataFormat::SetType( wxDataFormatId WXUNUSED(type) )
+{
+    wxMISSING_IMPLEMENTATION( "wxDataFormat SetType" );
+}
+
+bool wxDataFormat::operator==(wxDataFormatId format) const
+{
+    return m_MimeType == DataFormatIdToMimeType(format);
+}
+
+bool wxDataFormat::operator!=(wxDataFormatId format) const
+{
+    return m_MimeType != DataFormatIdToMimeType(format);
+}
+
+bool wxDataFormat::operator==(const wxDataFormat& format) const
+{
+    return m_MimeType == format.m_MimeType;
+}
+
+bool wxDataFormat::operator!=(const wxDataFormat& format) const
+{
+    return m_MimeType != format.m_MimeType;
+}
+
+//#############################################################################
+
+bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction) const
+{
+    return wxDataFormat(format) != wxDF_INVALID;
+}
+wxDataFormat wxDataObject::GetPreferredFormat(Direction) const
+{
+    /* formats are in order of preference */
+    if (m_qtMimeData.formats().count())
+        return m_qtMimeData.formats().first();
+
+    return wxDataFormat();
+}
+
+size_t wxDataObject::GetFormatCount(Direction) const
+{
+    return m_qtMimeData.formats().count();
+}
+
+void wxDataObject::GetAllFormats(wxDataFormat *formats, Direction) const
+{
+    int i = 0;
+    foreach (QString format, m_qtMimeData.formats())
+    {
+        formats[i] = format;
+        i++;
+    }
+}
+
+size_t wxDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    return  m_qtMimeData.data( format.m_MimeType ).count();
+}
+
+bool wxDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    if (!m_qtMimeData.hasFormat(format.m_MimeType))
+        return false;
+
+    QByteArray data = m_qtMimeData.data( format.m_MimeType ).data();
+    memcpy(buf, data.constData(), data.size());
+    return true;
+}
+
+bool wxDataObject::SetData(const wxDataFormat& format, size_t len, const void * buf)
+{
+    QByteArray bytearray((const char*)buf, len);
+    m_qtMimeData.setData(format.m_MimeType, bytearray);
+
+    return true;
+}
+
+wxBitmapDataObject::wxBitmapDataObject()
+{
+}
+
+wxBitmapDataObject::wxBitmapDataObject( const wxBitmap &WXUNUSED(bitmap) )
+{
+}
+
+wxFileDataObject::wxFileDataObject()
+{
+}
+ 
+void wxFileDataObject::AddFile( const wxString &WXUNUSED(filename) )
+{
+
+}
diff --git a/src/qt/dataview.cpp b/src/qt/dataview.cpp
new file mode 100644
index 0000000000..fc1aa181ed
--- /dev/null
+++ b/src/qt/dataview.cpp
@@ -0,0 +1,321 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dataview.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DATAVIEWCTRL
+
+#include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
+                  unsigned int model_column, int width,
+                  wxAlignment align,
+                  int flags )
+    : wxDataViewColumnBase( renderer, model_column )
+{
+}
+
+wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer,
+                  unsigned int model_column, int width,
+                  wxAlignment align,
+                  int flags )
+    : wxDataViewColumnBase( bitmap, renderer, model_column )
+{
+}
+
+void wxDataViewColumn::SetTitle( const wxString &title )
+{
+}
+
+void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
+{
+}
+
+void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
+{
+}
+
+void wxDataViewColumn::SetAlignment( wxAlignment align )
+{
+}
+
+void wxDataViewColumn::SetSortable( bool sortable )
+{
+}
+
+void wxDataViewColumn::SetSortOrder( bool ascending )
+{
+}
+
+void wxDataViewColumn::SetAsSortKey(bool sort)
+{
+}
+
+void wxDataViewColumn::SetResizeable( bool resizeable )
+{
+}
+
+void wxDataViewColumn::SetHidden( bool hidden )
+{
+}
+
+void wxDataViewColumn::SetMinWidth( int minWidth )
+{
+}
+
+void wxDataViewColumn::SetWidth( int width )
+{
+}
+
+void wxDataViewColumn::SetReorderable( bool reorderable )
+{
+}
+
+void wxDataViewColumn::SetFlags(int flags)
+{
+}
+
+wxString wxDataViewColumn::GetTitle() const
+{
+    return wxString();
+}
+
+wxAlignment wxDataViewColumn::GetAlignment() const
+{
+    return wxAlignment();
+}
+
+bool wxDataViewColumn::IsSortable() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsSortOrderAscending() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsSortKey() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsResizeable() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsHidden() const
+{
+    return false;
+}
+
+int wxDataViewColumn::GetWidth() const
+{
+    return 0;
+}
+
+int wxDataViewColumn::GetMinWidth() const
+{
+    return 0;
+}
+
+bool wxDataViewColumn::IsReorderable() const
+{
+    return false;
+}
+
+int wxDataViewColumn::GetFlags() const
+{
+    return 0;
+}
+
+//##############################################################################
+
+
+wxDataViewCtrl::wxDataViewCtrl()
+{
+}
+
+wxDataViewCtrl::wxDataViewCtrl( wxWindow *parent, wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size, long style,
+       const wxValidator& validator)
+{
+}
+
+wxDataViewCtrl::~wxDataViewCtrl()
+{
+}
+
+
+
+bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size, long style,
+       const wxValidator& validator)
+{
+    return false;
+}
+
+bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    return false;
+}
+
+unsigned wxDataViewCtrl::GetColumnCount() const
+{
+    return 0;
+}
+
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+    return NULL;
+}
+
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+    return false;
+}
+
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    return 0;
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
+wxDataViewItem wxDataViewCtrl::GetSelection() const
+{
+    return wxDataViewItem();
+}
+
+int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
+{
+    return 0;
+}
+
+void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
+{
+}
+
+void wxDataViewCtrl::Select( const wxDataViewItem & item )
+{
+}
+
+void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
+{
+}
+
+bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
+{
+    return false;
+}
+
+void wxDataViewCtrl::SelectAll()
+{
+}
+
+void wxDataViewCtrl::UnselectAll()
+{
+}
+
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem& item,
+                            const wxDataViewColumn *column)
+{
+}
+
+void wxDataViewCtrl::HitTest( const wxPoint &point,
+                      wxDataViewItem &item,
+                      wxDataViewColumn *&column ) const
+{
+}
+
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item,
+                            const wxDataViewColumn *column) const
+{
+    return wxRect();
+}
+
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+}
+
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+    return false;
+}
+
+bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
+{
+    return false;
+}
+
+wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+    return wxVisualAttributes();
+}
+
+void wxDataViewCtrl::OnInternalIdle()
+{
+}
+
+void wxDataViewCtrl::DoSetExpanderColumn()
+{
+}
+
+void wxDataViewCtrl::DoSetIndent()
+{
+}
+
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    return wxDataViewItem();
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL
diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
new file mode 100644
index 0000000000..aa133f8721
--- /dev/null
+++ b/src/qt/dc.cpp
@@ -0,0 +1,786 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dc.cpp
+// Author:      Peter Most, Javier Torres, Mariano Reingart
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dc.h"
+#include "wx/icon.h"
+#include "wx/qt/dc.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/utils.h"
+#include <QtGui/QBitmap>
+
+static void SetPenColour( QPainter *qtPainter, QColor col )
+{
+    QPen p = qtPainter->pen();
+    p.setColor( col );
+    qtPainter->setPen( p );
+}
+
+static void SetBrushColour( QPainter *qtPainter, QColor col )
+{
+    QBrush b = qtPainter->brush();
+    b.setColor( col );
+    qtPainter->setBrush( b );
+}
+
+wxQtDCImpl::wxQtDCImpl( wxDC *owner )
+    : wxDCImpl( owner )
+{
+    m_clippingRegion = new wxRegion;
+    m_qtImage = NULL;
+    m_rasterColourOp = wxQtNONE;
+    m_ok = true;
+}
+
+wxQtDCImpl::~wxQtDCImpl()
+{
+    if ( m_qtPainter )
+    {
+        if( m_qtPainter->isActive() )
+        {
+            m_qtPainter->end();
+        }
+        delete m_qtPainter;
+    }
+    if ( m_clippingRegion != NULL )
+        delete m_clippingRegion;
+}
+
+void wxQtDCImpl::QtPreparePainter( )
+{
+    //Do here all QPainter initialization (called after each begin())
+    if ( m_qtPainter == NULL )
+    {
+        wxLogDebug(wxT("wxQtDCImpl::QtPreparePainter is NULL!!!"));
+    }
+    else if ( m_qtPainter->isActive() )
+    {
+        m_qtPainter->setPen( wxPen().GetHandle() );
+        m_qtPainter->setBrush( wxBrush().GetHandle() );
+    }
+    else
+    {
+        wxLogDebug(wxT("wxQtDCImpl::QtPreparePainter not active!"));
+    }
+}
+
+bool wxQtDCImpl::CanDrawBitmap() const
+{
+    return true;
+}
+
+bool wxQtDCImpl::CanGetTextExtent() const
+{
+    return true;
+}
+
+void wxQtDCImpl::DoGetSize(int *width, int *height) const
+{
+    *width  = m_qtPainter->device()->width();
+    *height = m_qtPainter->device()->height();
+}
+
+void wxQtDCImpl::DoGetSizeMM(int* width, int* height) const
+{
+    *width  = m_qtPainter->device()->widthMM();
+    *height = m_qtPainter->device()->heightMM();
+}
+
+int wxQtDCImpl::GetDepth() const
+{
+    return m_qtPainter->device()->depth();
+}
+
+wxSize wxQtDCImpl::GetPPI() const
+{
+    return wxSize(m_qtPainter->device()->logicalDpiX(), m_qtPainter->device()->logicalDpiY());
+}
+
+void wxQtDCImpl::SetFont(const wxFont& font)
+{
+    m_font = font;
+    
+    m_qtPainter->setFont(font.GetHandle());
+}
+
+void wxQtDCImpl::SetPen(const wxPen& pen)
+{
+    m_pen = pen;
+
+    m_qtPainter->setPen(pen.GetHandle());
+
+    ApplyRasterColourOp();
+}
+
+void wxQtDCImpl::SetBrush(const wxBrush& brush)
+{
+    m_brush = brush;
+    
+    if (brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE)
+    {
+        // Use a monochrome mask: use foreground color for the mask
+        QBrush b(brush.GetHandle());
+        b.setColor(m_textForegroundColour.GetHandle());
+        b.setTexture(b.texture().mask());
+        m_qtPainter->setBrush(b);
+    }
+    else if (brush.GetStyle() == wxBRUSHSTYLE_STIPPLE)
+    {
+        //Don't use the mask
+        QBrush b(brush.GetHandle());
+
+        QPixmap p = b.texture();
+        p.setMask(QBitmap());
+        b.setTexture(p);
+
+        m_qtPainter->setBrush(b);
+    }
+    else
+    {
+        m_qtPainter->setBrush(brush.GetHandle());
+    }
+
+    ApplyRasterColourOp();
+}
+
+void wxQtDCImpl::SetBackground(const wxBrush& brush)
+{
+    m_backgroundBrush = brush;
+    
+    m_qtPainter->setBackground(brush.GetHandle());
+}
+
+void wxQtDCImpl::SetBackgroundMode(int mode)
+{
+    /* Do not change QPainter, as wx uses this background mode
+     * only for drawing text, where Qt uses it for everything.
+     * Always let QPainter mode to transparent, and change it
+     * when needed */
+    m_backgroundMode = mode;
+}
+
+
+#if wxUSE_PALETTE
+void wxQtDCImpl::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+    wxMISSING_IMPLEMENTATION(__FUNCTION__);
+}
+#endif // wxUSE_PALETTE
+
+void wxQtDCImpl::SetLogicalFunction(wxRasterOperationMode function)
+{
+    m_logicalFunction = function;
+
+    wxQtRasterColourOp rasterColourOp;
+    switch ( function )
+    {
+        case wxCLEAR:       // 0
+            m_qtPainter->setCompositionMode( QPainter::CompositionMode_SourceOver );
+            rasterColourOp = wxQtBLACK;
+            break;
+        case wxXOR:         // src XOR dst
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_SourceXorDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxINVERT:      // NOT dst => dst XOR WHITE
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_SourceXorDestination );
+            rasterColourOp = wxQtWHITE;
+            break;
+        case wxOR_REVERSE:  // src OR (NOT dst) => (NOT (NOT src)) OR (NOT dst)
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_NotSourceOrNotDestination );
+            rasterColourOp = wxQtINVERT;
+            break;
+        case wxAND_REVERSE: // src AND (NOT dst)
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_SourceAndNotDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxCOPY:        // src
+            m_qtPainter->setCompositionMode( QPainter::CompositionMode_SourceOver );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxAND:         // src AND dst
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_SourceAndDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxAND_INVERT:  // (NOT src) AND dst
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_NotSourceAndDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxNO_OP:       // dst
+            m_qtPainter->setCompositionMode( QPainter::QPainter::CompositionMode_DestinationOver );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxNOR:         // (NOT src) AND (NOT dst)
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_NotSourceAndNotDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxEQUIV:       // (NOT src) XOR dst
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_NotSourceXorDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxSRC_INVERT:  // (NOT src)
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_NotSource );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxOR_INVERT:   // (NOT src) OR dst
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_SourceOrDestination );
+            rasterColourOp = wxQtINVERT;
+            break;
+        case wxNAND:        // (NOT src) OR (NOT dst)
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_NotSourceOrNotDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxOR:          // src OR dst
+            m_qtPainter->setCompositionMode( QPainter::RasterOp_SourceOrDestination );
+            rasterColourOp = wxQtNONE;
+            break;
+        case wxSET:          // 1
+            m_qtPainter->setCompositionMode( QPainter::CompositionMode_SourceOver );
+            rasterColourOp = wxQtWHITE;
+            break;
+    }
+
+    if ( rasterColourOp != m_rasterColourOp )
+    {
+        // Source colour mode changed
+        m_rasterColourOp = rasterColourOp;
+
+        // Restore original colours and apply new mode
+        SetPenColour( m_qtPainter, m_qtPenColor );
+        SetBrushColour( m_qtPainter, m_qtPenColor );
+
+        ApplyRasterColourOp();
+    }
+}
+
+void wxQtDCImpl::ApplyRasterColourOp()
+{
+    // Save colours
+    m_qtPenColor = m_qtPainter->pen().color();
+    m_qtBrushColor = m_qtPainter->brush().color();
+
+    // Apply op
+    switch ( m_rasterColourOp )
+    {
+        case wxQtWHITE:
+            SetPenColour( m_qtPainter, QColor( Qt::white ) );
+            SetBrushColour( m_qtPainter, QColor( Qt::white ) );
+            break;
+        case wxQtBLACK:
+            SetPenColour( m_qtPainter, QColor( Qt::black ) );
+            SetBrushColour( m_qtPainter, QColor( Qt::black ) );
+            break;
+        case wxQtINVERT:
+            SetPenColour( m_qtPainter, QColor( ~m_qtPenColor.rgb() ) );
+            SetBrushColour( m_qtPainter, QColor( ~m_qtBrushColor.rgb() ) );
+            break;
+        case wxQtNONE:
+            // No op
+            break;
+    }
+}
+
+wxCoord wxQtDCImpl::GetCharHeight() const
+{
+    QFontMetrics metrics(m_qtPainter->font());
+    return wxCoord( metrics.height() );
+}
+
+wxCoord wxQtDCImpl::GetCharWidth() const
+{
+    //FIXME: Returning max width, instead of average
+    QFontMetrics metrics(m_qtPainter->font());
+    return wxCoord( metrics.maxWidth() );
+}
+
+void wxQtDCImpl::DoGetTextExtent(const wxString& string,
+                             wxCoord *x, wxCoord *y,
+                             wxCoord *descent,
+                             wxCoord *externalLeading,
+                             const wxFont *theFont ) const
+{
+    QFont f = m_qtPainter->font();
+    if (theFont != NULL)
+        f = theFont->GetHandle();
+
+    QFontMetrics metrics(f);
+    if (x != NULL || y != NULL)
+    {
+        // note that boundingRect doesn't return "advance width" for spaces
+        if (x != NULL)
+            *x = metrics.width( wxQtConvertString(string) );
+        if (y != NULL)
+            *y = metrics.height();
+    }
+
+    if (descent != NULL)
+        *descent = metrics.descent();
+
+    if (externalLeading != NULL)
+        *externalLeading = metrics.leading();
+}
+
+void wxQtDCImpl::Clear()
+{
+    int width, height;
+    DoGetSize(&width, &height);
+    
+    m_qtPainter->eraseRect(QRect(0, 0, width, height));
+}
+
+void wxQtDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y,
+                                 wxCoord width, wxCoord height)
+{
+    // Special case: Empty region -> DestroyClippingRegion()
+    if ( width == 0 && height == 0 )
+    {
+        DestroyClippingRegion();
+    }
+    else
+    {
+        // Set QPainter clipping (intersection if not the first one)
+        m_qtPainter->setClipRect( x, y, width, height,
+                                 m_clipping ? Qt::IntersectClip : Qt::ReplaceClip );
+
+        // Set internal state for getters
+        /* Note: Qt states that QPainter::clipRegion() may be slow, so we
+         * keep the region manually, which should be faster */
+        if ( m_clipping )
+            m_clippingRegion->Union( wxRect( x, y, width, height ) );
+        else
+            m_clippingRegion->Intersect( wxRect( x, y, width, height ) );
+
+        wxRect clipRect = m_clippingRegion->GetBox();
+
+        m_clipX1 = clipRect.GetLeft();
+        m_clipX2 = clipRect.GetRight();
+        m_clipY1 = clipRect.GetTop();
+        m_clipY2 = clipRect.GetBottom();
+        m_clipping = true;
+    }
+}
+
+void wxQtDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
+{
+    if ( region.IsEmpty() )
+    {
+        DestroyClippingRegion();
+    }
+    else
+    {
+        QRegion qregion = region.GetHandle();
+        // Save current origin / scale (logical coordinates)
+        QTransform qtrans = m_qtPainter->worldTransform();
+        // Reset transofrmation to match device coordinates
+        m_qtPainter->setWorldTransform( QTransform() );
+        wxLogDebug(wxT("wxQtDCImpl::DoSetDeviceClippingRegion rect %d %d %d %d"),
+                   qregion.boundingRect().x(), qregion.boundingRect().y(),
+                   qregion.boundingRect().width(), qregion.boundingRect().height());
+        // Set QPainter clipping (intersection if not the first one)
+        m_qtPainter->setClipRegion( qregion,
+                                 m_clipping ? Qt::IntersectClip : Qt::ReplaceClip );
+
+        // Restore the transformation (translation / scale):
+        m_qtPainter->setWorldTransform( qtrans );
+
+        // Set internal state for getters
+        /* Note: Qt states that QPainter::clipRegion() may be slow, so we
+        * keep the region manually, which should be faster */
+        if ( m_clipping )
+            m_clippingRegion->Union( region );
+        else
+            m_clippingRegion->Intersect( region );
+
+        wxRect clipRect = m_clippingRegion->GetBox();
+
+        m_clipX1 = clipRect.GetLeft();
+        m_clipX2 = clipRect.GetRight();
+        m_clipY1 = clipRect.GetTop();
+        m_clipY2 = clipRect.GetBottom();
+        m_clipping = true;
+    }
+}
+
+void wxQtDCImpl::DestroyClippingRegion()
+{
+    ResetClipping();
+    m_clippingRegion->Clear();
+    m_qtPainter->setClipping( false );
+}
+
+bool wxQtDCImpl::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                         wxFloodFillStyle style )
+{
+#if wxUSE_IMAGE
+    extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+                              const wxColour & col, wxFloodFillStyle style);
+
+    return wxDoFloodFill( GetOwner(), x, y, col, style);
+#else
+    wxUnusedVar(x);
+    wxUnusedVar(y);
+    wxUnusedVar(col);
+    wxUnusedVar(style);
+
+    return false;
+#endif
+}
+
+bool wxQtDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
+{
+    wxCHECK_MSG( m_qtPainter->isActive(), false, "Invalid wxDC" );
+
+    if ( col )
+    {
+        wxCHECK_MSG( m_qtImage != NULL, false, "This DC doesn't support GetPixel()" );
+        
+        QColor pixel = m_qtImage->pixel( x, y );
+        col->Set( pixel.red(), pixel.green(), pixel.blue(), pixel.alpha() );
+
+        return true;
+    }
+    else
+        return false;
+}
+
+void wxQtDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
+{
+    m_qtPainter->drawPoint(x, y);
+}
+
+void wxQtDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+{
+    m_qtPainter->drawLine(x1, y1, x2, y2);
+}
+
+
+void wxQtDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
+                       wxCoord x2, wxCoord y2,
+                       wxCoord xc, wxCoord yc)
+{
+    // Calculate the rectangle that contains the circle
+    QLineF l1( xc, yc, x1, y1 );
+    QLineF l2( xc, yc, x2, y2 );
+    QPointF center( xc, yc );
+
+    qreal penWidth = m_qtPainter->pen().width();
+    qreal lenRadius = l1.length() - penWidth / 2;
+    QPointF centerToCorner( lenRadius, lenRadius );
+    
+    QRect rectangle = QRectF( center - centerToCorner, center + centerToCorner ).toRect();
+
+    // Calculate the angles
+    int startAngle = (int)( l1.angle() * 16 );
+    int endAngle = (int)( l2.angle() * 16 );
+    int spanAngle = endAngle - startAngle;
+    if ( spanAngle < 0 )
+    {
+        spanAngle = -spanAngle;
+    }
+    
+    if ( spanAngle == 0 )
+        m_qtPainter->drawEllipse( rectangle );
+    else
+        m_qtPainter->drawPie( rectangle, startAngle, spanAngle );
+}
+
+void wxQtDCImpl::DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                               double sa, double ea)
+{
+    int penWidth = m_qtPainter->pen().width();
+    x += penWidth / 2;
+    y += penWidth / 2;
+    w -= penWidth;
+    h -= penWidth;
+    
+    m_qtPainter->drawPie( x, y, w, h, (int)( sa * 16 ), (int)( ( ea - sa ) * 16 ) );
+}
+
+void wxQtDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    int penWidth = m_qtPainter->pen().width();
+    x += penWidth / 2;
+    y += penWidth / 2;
+    width -= penWidth;
+    height -= penWidth;
+
+    m_qtPainter->drawRect( x, y, width, height );
+}
+
+void wxQtDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                    wxCoord width, wxCoord height,
+                                    double radius)
+{
+    int penWidth = m_qtPainter->pen().width();
+    x += penWidth / 2;
+    y += penWidth / 2;
+    width -= penWidth;
+    height -= penWidth;
+    
+    m_qtPainter->drawRoundedRect( x, y, width, height, radius, radius );
+}
+
+void wxQtDCImpl::DoDrawEllipse(wxCoord x, wxCoord y,
+                           wxCoord width, wxCoord height)
+{
+    QBrush savedBrush;
+    int penWidth = m_qtPainter->pen().width();
+    x += penWidth / 2;
+    y += penWidth / 2;
+    width -= penWidth;
+    height -= penWidth;
+    
+    if ( m_pen.IsNonTransparent() )
+    {
+        // Save pen/brush
+        savedBrush = m_qtPainter->brush();
+        // Fill with text background color ("no fill" like in wxGTK):
+        m_qtPainter->setBrush(QBrush(m_textBackgroundColour.GetHandle()));
+    }
+
+    // Draw
+    m_qtPainter->drawEllipse( x, y, width, height );
+
+    if ( m_pen.IsNonTransparent() )
+    {
+        //Restore saved settings
+        m_qtPainter->setBrush(savedBrush);
+    }
+}
+
+void wxQtDCImpl::DoCrossHair(wxCoord x, wxCoord y)
+{
+    int w, h;
+    DoGetSize( &w, &h );
+
+    // Map width and height back (inverted transform)
+    QTransform inv = m_qtPainter->transform().inverted();
+    int left, top, right, bottom;
+    inv.map( w, h, &right, &bottom );
+    inv.map( 0, 0, &left, &top );
+    
+    m_qtPainter->drawLine( left, y, right, y );
+    m_qtPainter->drawLine( x, top, x, bottom );
+}
+
+void wxQtDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+{
+    DoDrawBitmap( icon, x, y, true );
+}
+
+void wxQtDCImpl::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                          bool useMask )
+{
+    QPixmap pix = *bmp.GetHandle();
+    if (pix.depth() == 1) {
+        //Monochrome bitmap, draw using text fore/background
+        
+        //Save pen/brush
+        QBrush savedBrush = m_qtPainter->background();
+        QPen savedPen = m_qtPainter->pen();
+        
+        //Use text colors
+        m_qtPainter->setBackground(QBrush(m_textBackgroundColour.GetHandle()));
+        m_qtPainter->setPen(QPen(m_textForegroundColour.GetHandle()));
+
+        //Draw
+        m_qtPainter->drawPixmap(x, y, pix);
+        
+        //Restore saved settings
+        m_qtPainter->setBackground(savedBrush);
+        m_qtPainter->setPen(savedPen);
+    } else {
+        if ( !useMask && bmp.GetMask() )
+        {
+            // Temporarly disable mask
+            QBitmap mask;
+            mask = pix.mask();
+            pix.setMask( QBitmap() );
+
+            // Draw
+            m_qtPainter->drawPixmap(x, y, pix);
+
+            // Restore saved mask
+            pix.setMask( mask );
+        }
+        else
+            m_qtPainter->drawPixmap(x, y, pix);
+    }
+}
+
+void wxQtDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+{
+    QPen savedPen = m_qtPainter->pen();
+    m_qtPainter->setPen(QPen(m_textForegroundColour.GetHandle()));
+
+    // Disable logical function
+    QPainter::CompositionMode savedOp = m_qtPainter->compositionMode();
+    m_qtPainter->setCompositionMode( QPainter::CompositionMode_SourceOver );
+    
+    if (m_backgroundMode == wxSOLID)
+    {
+        m_qtPainter->setBackgroundMode(Qt::OpaqueMode);
+    
+        //Save pen/brush
+        QBrush savedBrush = m_qtPainter->background();
+
+        //Use text colors
+        m_qtPainter->setBackground(QBrush(m_textBackgroundColour.GetHandle()));
+
+        //Draw
+        m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text));
+
+        //Restore saved settings
+        m_qtPainter->setBackground(savedBrush);
+
+
+        m_qtPainter->setBackgroundMode(Qt::TransparentMode);
+    }
+    else
+        m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text));
+
+    m_qtPainter->setPen(savedPen);
+    m_qtPainter->setCompositionMode( savedOp );
+}
+
+void wxQtDCImpl::DoDrawRotatedText(const wxString& text,
+                               wxCoord x, wxCoord y, double angle)
+{
+    if (m_backgroundMode == wxSOLID)
+        m_qtPainter->setBackgroundMode(Qt::OpaqueMode);
+    
+    //Move and rotate (reverse angle direction in Qt and wx)
+    m_qtPainter->translate(x, y);
+    m_qtPainter->rotate(-angle);
+
+    QPen savedPen = m_qtPainter->pen();
+    m_qtPainter->setPen(QPen(m_textForegroundColour.GetHandle()));
+
+    // Disable logical function
+    QPainter::CompositionMode savedOp = m_qtPainter->compositionMode();
+    m_qtPainter->setCompositionMode( QPainter::CompositionMode_SourceOver );
+
+    if (m_backgroundMode == wxSOLID)
+    {
+        m_qtPainter->setBackgroundMode(Qt::OpaqueMode);
+        
+        //Save pen/brush
+        QBrush savedBrush = m_qtPainter->background();
+        
+        //Use text colors
+        m_qtPainter->setBackground(QBrush(m_textBackgroundColour.GetHandle()));
+        
+        //Draw
+        m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text));
+        
+        //Restore saved settings
+        m_qtPainter->setBackground(savedBrush);
+        
+        m_qtPainter->setBackgroundMode(Qt::TransparentMode);
+    }
+    else
+        m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text));
+
+    //Reset to default
+    ComputeScaleAndOrigin();
+    m_qtPainter->setPen(savedPen);
+    m_qtPainter->setCompositionMode( savedOp );
+}
+
+bool wxQtDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
+                    wxCoord width, wxCoord height,
+                    wxDC *source,
+                    wxCoord xsrc, wxCoord ysrc,
+                    wxRasterOperationMode rop,
+                    bool useMask,
+                    wxCoord WXUNUSED(xsrcMask),
+                    wxCoord WXUNUSED(ysrcMask) )
+{
+    wxMISSING_IMPLEMENTATION( "wxDC::DoBlit Mask src" );
+
+    wxQtDCImpl *implSource = (wxQtDCImpl*)source->GetImpl();
+    
+    QImage *qtSource = implSource->m_qtImage;
+    
+    // Not a CHECK on purpose
+    if ( !qtSource )
+        return false;
+
+    QImage qtSourceConverted = *qtSource;
+    if ( !useMask )
+        qtSourceConverted = qtSourceConverted.convertToFormat( QImage::Format_RGB32 );
+
+    // Change logical function
+    wxRasterOperationMode savedMode = GetLogicalFunction();
+    SetLogicalFunction( rop );
+    
+    m_qtPainter->drawImage( QRect( xdest, ydest, width, height ),
+                           qtSourceConverted,
+                           QRect( xsrc, ysrc, width, height ) );
+
+    SetLogicalFunction( savedMode );
+
+    return true;
+}
+
+void wxQtDCImpl::DoDrawLines(int n, const wxPoint points[],
+                         wxCoord xoffset, wxCoord yoffset )
+{
+    if (n > 0)
+    {
+        QPainterPath path(wxQtConvertPoint(points[0]));
+        for (int i = 1; i < n; i++)
+        {
+            path.lineTo(wxQtConvertPoint(points[i]));
+        }
+
+        m_qtPainter->translate(xoffset, yoffset);
+        m_qtPainter->drawPath(path);
+
+        // Reset transform
+        ComputeScaleAndOrigin();
+    }
+}
+
+void wxQtDCImpl::DoDrawPolygon(int n, const wxPoint points[],
+                       wxCoord xoffset, wxCoord yoffset,
+                       wxPolygonFillMode fillStyle )
+{
+    QPolygon qtPoints;
+    for (int i = 0; i < n; i++) {
+        qtPoints << wxQtConvertPoint(points[i]);
+    }
+
+    Qt::FillRule fill = (fillStyle == wxWINDING_RULE) ? Qt::WindingFill : Qt::OddEvenFill;
+    
+    m_qtPainter->translate(xoffset, yoffset);
+    m_qtPainter->drawPolygon(qtPoints, fill);
+    // Reset transform
+    ComputeScaleAndOrigin();
+}
+
+void wxQtDCImpl::ComputeScaleAndOrigin()
+{
+    QTransform t;
+
+    // First apply device origin
+    t.translate( m_deviceOriginX + m_deviceLocalOriginX,
+                 m_deviceOriginY + m_deviceLocalOriginY );
+
+    // Second, scale
+    m_scaleX = m_logicalScaleX * m_userScaleX;
+    m_scaleY = m_logicalScaleY * m_userScaleY;
+    t.scale( m_scaleX * m_signX, m_scaleY * m_signY );
+
+    // Finally, logical origin
+    t.translate( m_logicalOriginX, m_logicalOriginY );
+
+    // Apply transform to QPainter, overwriting the previous one
+    m_qtPainter->setWorldTransform(t, false);
+}
diff --git a/src/qt/dcclient.cpp b/src/qt/dcclient.cpp
new file mode 100644
index 0000000000..8d4ad98413
--- /dev/null
+++ b/src/qt/dcclient.cpp
@@ -0,0 +1,130 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dcclient.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dcclient.h"
+#include "wx/log.h"
+#include "wx/qt/dcclient.h"
+
+#include <QtGui/QPicture>
+
+//##############################################################################
+
+wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
+    : wxQtDCImpl( owner )
+{
+    m_window = NULL;
+    m_ok = false;
+    m_qtPainter = new QPainter();
+}
+
+wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *win )
+    : wxQtDCImpl( owner )
+{
+    m_window = win;
+    m_qtPainter = m_window->QtGetPainter();
+    // if we're not inside a Paint event, painter will invalid
+    m_ok = m_qtPainter != NULL;
+}
+
+wxWindowDCImpl::~wxWindowDCImpl()
+{
+    if ( m_ok )
+    {
+        m_ok = false;
+    }
+    if ( m_window )
+    {
+        // do not destroy as it is owned by the window
+        m_qtPainter = NULL;
+    }
+}
+
+//##############################################################################
+
+
+wxClientDCImpl::wxClientDCImpl( wxDC *owner )
+    : wxWindowDCImpl( owner )
+{
+    m_window = NULL;
+}
+
+wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *win )
+    : wxWindowDCImpl( owner )
+{
+    m_window = win;
+
+    QPicture *pic = win->QtGetPicture();
+    m_ok = m_qtPainter->begin( pic );
+    QtPreparePainter();
+}
+
+wxClientDCImpl::~wxClientDCImpl()
+{
+    /* Paint to a QPicture that will then be painted in the next
+     * paint event of that window (a paint event will be generated
+     * when this wxClientDC is done). */
+    if ( m_ok )
+    {
+        m_qtPainter->end();
+        m_ok = false;
+        QPicture *pict = m_window->QtGetPicture();
+
+        if ( m_window != NULL )
+        {
+            // get the inner widget in scroll areas:
+            QWidget *widget;
+            if ( m_window->QtGetScrollBarsContainer() )
+            {
+                widget = m_window->QtGetScrollBarsContainer()->viewport();
+            } else {
+                widget = m_window->GetHandle();
+            }
+            // force paint event if there is something to replay and
+            // if not currently inside a paint event (to avoid recursion)
+            QRect rect = pict->boundingRect();
+            if ( !pict->isNull() && !widget->paintingActive() && !rect.isEmpty() )
+            {
+                // only force the update of the rect affected by the DC
+                widget->repaint( rect );
+                wxLogDebug( wxT("wxClientDC Repainting %s (%d %d %d %d)"),
+                           (const char*) m_window->GetName(),
+                           rect.left(), rect.top(), rect.width(), rect.height());
+            }
+            else
+            {
+                // Not drawing anything, reset picture to avoid issues in handler
+                pict->setData( NULL, 0 );
+            }
+            // let destroy the m_qtPainter (see inherited classes destructors)
+            m_window = NULL;
+        }
+    }
+}
+
+//##############################################################################
+
+wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
+    : wxWindowDCImpl( owner )
+{
+    if ( m_ok )
+    {
+        QtPreparePainter();
+    }
+}
+
+wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *win )
+    : wxWindowDCImpl( owner, win )
+{
+    if ( m_ok )
+    {
+        QtPreparePainter();
+    }
+}
+
diff --git a/src/qt/dcmemory.cpp b/src/qt/dcmemory.cpp
new file mode 100644
index 0000000000..49949fadf2
--- /dev/null
+++ b/src/qt/dcmemory.cpp
@@ -0,0 +1,85 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dcmemory.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dcmemory.h"
+#include "wx/qt/dcmemory.h"
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+    : wxQtDCImpl( owner )
+{
+    m_qtImage = NULL;
+    m_ok = false;
+    m_qtPainter = new QPainter();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+    : wxQtDCImpl( owner )
+{
+    m_qtImage = NULL;
+    m_ok = false;
+    m_qtPainter = new QPainter();
+    DoSelect( bitmap );
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
+    : wxQtDCImpl( owner )
+{
+    m_qtImage = NULL;
+    m_ok = false;
+}
+
+wxMemoryDCImpl::~wxMemoryDCImpl()
+{
+    // Deselect the bitmap, if any (warning: it can be already deleted)
+    DoSelect( wxNullBitmap );
+}
+
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
+{
+    if ( IsOk() )
+    {
+        // Finish the painting in the intermediate image device:
+        m_qtPainter->end();
+
+        if (m_selected.IsOk() && !m_selected.GetHandle()->isNull())
+        {
+            // Copy intermediate image to the bitmap
+            m_qtPainter->begin( m_selected.GetHandle() );
+            m_qtPainter->drawImage( QPoint( 0, 0 ), *m_qtImage );
+            m_qtPainter->end();
+        }
+        m_ok = false;
+    }
+
+    // clean up the intermediate image device:
+    if ( m_qtImage )
+    {
+        delete m_qtImage;
+        m_qtImage = NULL;
+    }
+
+    m_selected = bitmap;
+    if ( bitmap.IsOk() && !bitmap.GetHandle()->isNull() ) {
+        // create the intermediate image for the pixmap:
+        m_qtImage = new QImage( bitmap.GetHandle()->toImage() );
+        // start drawing on the intermediary device:
+        m_ok = m_qtPainter->begin( m_qtImage );
+    }
+}
+
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const
+{
+    return m_selected;
+}
+
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
+{
+    return m_selected;
+}
diff --git a/src/qt/dcprint.cpp b/src/qt/dcprint.cpp
new file mode 100644
index 0000000000..11a3d59d48
--- /dev/null
+++ b/src/qt/dcprint.cpp
@@ -0,0 +1,200 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dcprint.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dcprint.h"
+#include "wx/qt/dcprint.h"
+
+wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData & )
+    : wxDCImpl( owner )
+{
+}
+
+
+bool wxPrinterDCImpl::CanDrawBitmap() const
+{
+    return false;
+}
+
+bool wxPrinterDCImpl::CanGetTextExtent() const
+{
+    return false;
+}
+
+void wxPrinterDCImpl::DoGetSize(int *WXUNUSED(width), int *WXUNUSED(height)) const
+{
+}
+
+void wxPrinterDCImpl::DoGetSizeMM(int* WXUNUSED(width), int* WXUNUSED(height)) const
+{
+}
+
+int wxPrinterDCImpl::GetDepth() const
+{
+    return 0;
+}
+
+wxSize wxPrinterDCImpl::GetPPI() const
+{
+    return wxSize();
+}
+
+void wxPrinterDCImpl::SetFont(const wxFont& WXUNUSED(font))
+{
+}
+
+void wxPrinterDCImpl::SetPen(const wxPen& WXUNUSED(pen))
+{
+}
+
+void wxPrinterDCImpl::SetBrush(const wxBrush& WXUNUSED(brush))
+{
+}
+
+void wxPrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush))
+{
+}
+
+void wxPrinterDCImpl::SetBackgroundMode(int WXUNUSED(mode))
+{
+}
+
+
+#if wxUSE_PALETTE
+void wxPrinterDCImpl::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+}
+#endif // wxUSE_PALETTE
+
+void wxPrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
+{
+}
+
+wxCoord wxPrinterDCImpl::GetCharHeight() const
+{
+    return wxCoord();
+}
+
+wxCoord wxPrinterDCImpl::GetCharWidth() const
+{
+    return wxCoord();
+}
+
+void wxPrinterDCImpl::DoGetTextExtent(const wxString& WXUNUSED(string),
+                             wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y),
+                             wxCoord *WXUNUSED(descent),
+                             wxCoord *WXUNUSED(externalLeading),
+                             const wxFont *WXUNUSED(theFont) ) const
+{
+}
+
+void wxPrinterDCImpl::Clear()
+{
+}
+
+void wxPrinterDCImpl::DoSetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                 wxCoord WXUNUSED(width), wxCoord WXUNUSED(height))
+{
+}
+
+void wxPrinterDCImpl::DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))
+{
+}
+
+bool wxPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col),
+                         wxFloodFillStyle WXUNUSED(style) )
+{
+    return false;
+}
+
+bool wxPrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour *WXUNUSED(col)) const
+{
+    return false;
+}
+
+void wxPrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+{
+}
+
+void wxPrinterDCImpl::DoDrawLine(wxCoord WXUNUSED(x1), wxCoord WXUNUSED(y1), wxCoord WXUNUSED(x2), wxCoord WXUNUSED(y2))
+{
+}
+
+void wxPrinterDCImpl::DoDrawArc(wxCoord WXUNUSED(x1), wxCoord WXUNUSED(y1),
+                       wxCoord WXUNUSED(x2), wxCoord WXUNUSED(y2),
+                       wxCoord WXUNUSED(xc), wxCoord WXUNUSED(yc))
+{
+}
+
+void wxPrinterDCImpl::DoDrawEllipticArc(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(w), wxCoord WXUNUSED(h),
+                               double WXUNUSED(sa), double WXUNUSED(ea))
+{
+}
+
+void wxPrinterDCImpl::DoDrawRectangle(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height))
+{
+}
+
+void wxPrinterDCImpl::DoDrawRoundedRectangle(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                    wxCoord WXUNUSED(width), wxCoord WXUNUSED(height),
+                                    double WXUNUSED(radius))
+{
+}
+
+void wxPrinterDCImpl::DoDrawEllipse(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                           wxCoord WXUNUSED(width), wxCoord WXUNUSED(height))
+{
+}
+
+void wxPrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+{
+}
+
+void wxPrinterDCImpl::DoDrawIcon(const wxIcon& WXUNUSED(icon), wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+{
+}
+
+void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap &WXUNUSED(bmp), wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                          bool WXUNUSED(useMask))
+{
+}
+
+void wxPrinterDCImpl::DoDrawText(const wxString& WXUNUSED(text), wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+{
+}
+
+void wxPrinterDCImpl::DoDrawRotatedText(const wxString& WXUNUSED(text),
+                               wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), double WXUNUSED(angle))
+{
+}
+
+bool wxPrinterDCImpl::DoBlit(wxCoord WXUNUSED(xdest), wxCoord WXUNUSED(ydest),
+                    wxCoord WXUNUSED(width), wxCoord WXUNUSED(height),
+                    wxDC *WXUNUSED(source),
+                    wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),
+                    wxRasterOperationMode WXUNUSED(rop),
+                    bool WXUNUSED(useMask),
+                    wxCoord WXUNUSED(xsrcMask),
+                    wxCoord WXUNUSED(ysrcMask))
+{
+    return false;
+}
+
+void wxPrinterDCImpl::DoDrawLines(int WXUNUSED(n), const wxPoint WXUNUSED(points)[],
+                         wxCoord WXUNUSED(xoffset), wxCoord WXUNUSED(yoffset) )
+{
+}
+
+void wxPrinterDCImpl::DoDrawPolygon(int WXUNUSED(n), const wxPoint WXUNUSED(points)[],
+                       wxCoord WXUNUSED(xoffset), wxCoord WXUNUSED(yoffset),
+                       wxPolygonFillMode WXUNUSED(fillStyle) )
+{
+}
+
+
diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp
new file mode 100644
index 0000000000..4b1902ce9d
--- /dev/null
+++ b/src/qt/dcscreen.cpp
@@ -0,0 +1,18 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dcscreen.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dcscreen.h"
+#include "wx/qt/dcscreen.h"
+
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
+    : wxWindowDCImpl( owner )
+{
+}
+
diff --git a/src/qt/defs.cpp b/src/qt/defs.cpp
new file mode 100644
index 0000000000..a1740f5c4d
--- /dev/null
+++ b/src/qt/defs.cpp
@@ -0,0 +1,11 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/defs.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"
diff --git a/src/qt/dialog.cpp b/src/qt/dialog.cpp
new file mode 100644
index 0000000000..cf71b31364
--- /dev/null
+++ b/src/qt/dialog.cpp
@@ -0,0 +1,90 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dialog.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dialog.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtDialog : public wxQtEventSignalHandler< QDialog, wxDialog >
+{
+
+    public:
+        wxQtDialog( wxWindow *parent, wxDialog *handler );
+};
+
+
+wxQtDialog::wxQtDialog( wxWindow *parent, wxDialog *handler )
+    : wxQtEventSignalHandler< QDialog, wxDialog >( parent, handler )
+{
+}
+
+wxDialog::wxDialog()
+{
+}
+
+wxDialog::wxDialog( wxWindow *parent, wxWindowID id,
+        const wxString &title,
+        const wxPoint &pos,
+        const wxSize &size,
+        long style,
+        const wxString &name)
+{
+    Create( parent, id, title, pos, size, style, name );
+}
+
+wxDialog::~wxDialog()
+{
+}
+
+
+bool wxDialog::Create( wxWindow *parent, wxWindowID id,
+        const wxString &title,
+        const wxPoint &pos,
+        const wxSize &size,
+        long style,
+        const wxString &name)
+{
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;
+
+    m_qtWindow = new wxQtDialog( parent, this );
+    PostCreation();
+    return wxTopLevelWindow::Create( parent, id, title, pos, size, style, name );
+}
+
+int wxDialog::ShowModal()
+{
+    wxCHECK_MSG( GetHandle() != NULL, -1, "Invalid dialog" );
+    
+    return GetHandle()->exec() ? wxID_OK : wxID_CANCEL;
+}
+
+void wxDialog::EndModal(int retCode)
+{
+    wxCHECK_RET( GetHandle() != NULL, "Invalid dialog" );
+    
+    GetHandle()->done( retCode );
+}
+
+bool wxDialog::IsModal() const
+{
+    wxCHECK_MSG( GetHandle() != NULL, false, "Invalid dialog" );
+
+    return GetHandle()->isModal();
+}
+
+QDialog *wxDialog::GetHandle() const
+{
+    return static_cast<QDialog*>(m_qtWindow);
+}
+
diff --git a/src/qt/display.cpp b/src/qt/display.cpp
new file mode 100644
index 0000000000..28cc87358f
--- /dev/null
+++ b/src/qt/display.cpp
@@ -0,0 +1,102 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/display.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/display.h"
+#include "wx/display_impl.h"
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include "wx/qt/private/converter.h"
+
+class wxDisplayImplQt : public wxDisplayImpl
+{
+public:
+    wxDisplayImplQt( unsigned n );
+
+    virtual wxRect GetGeometry() const;
+    virtual wxString GetName() const;
+
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
+    virtual wxVideoMode GetCurrentMode() const;
+    virtual bool ChangeMode(const wxVideoMode& mode);
+};
+
+wxDisplayImplQt::wxDisplayImplQt( unsigned n )
+    : wxDisplayImpl( n )
+{
+}
+
+wxRect wxDisplayImplQt::GetGeometry() const
+{
+    return wxQtConvertRect( QApplication::desktop()->screenGeometry( GetIndex() ));
+}
+
+wxString wxDisplayImplQt::GetName() const
+{
+    return wxString();
+}
+
+wxArrayVideoModes wxDisplayImplQt::GetModes(const wxVideoMode& WXUNUSED(mode)) const
+{
+    return wxArrayVideoModes();
+}
+
+wxVideoMode wxDisplayImplQt::GetCurrentMode() const
+{
+    int width = QApplication::desktop()->width();
+    int height = QApplication::desktop()->height();
+    int depth = QApplication::desktop()->depth();
+
+    return wxVideoMode( width, height, depth );
+}
+
+bool wxDisplayImplQt::ChangeMode(const wxVideoMode& WXUNUSED(mode))
+{
+    return false;
+}
+
+
+//##############################################################################
+
+class wxDisplayFactoryQt : public wxDisplayFactory
+{
+public:
+    wxDisplayFactoryQt();
+
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+    virtual unsigned GetCount();
+    virtual int GetFromPoint(const wxPoint& pt);
+};
+
+    
+wxDisplayFactoryQt::wxDisplayFactoryQt()
+{
+}
+
+wxDisplayImpl *wxDisplayFactoryQt::CreateDisplay(unsigned n)
+{
+    return new wxDisplayImplQt( n );
+}
+
+unsigned wxDisplayFactoryQt::GetCount()
+{
+    return QApplication::desktop()->screenCount();
+}
+
+int wxDisplayFactoryQt::GetFromPoint(const wxPoint& pt)
+{
+    return QApplication::desktop()->screenNumber( wxQtConvertPoint( pt ));
+}
+
+//##############################################################################
+
+/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
+{
+    return new wxDisplayFactoryQt;
+}
diff --git a/src/qt/dnd.cpp b/src/qt/dnd.cpp
new file mode 100644
index 0000000000..3b7fda37b8
--- /dev/null
+++ b/src/qt/dnd.cpp
@@ -0,0 +1,60 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dnd.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dnd.h"
+
+wxDropTarget::wxDropTarget(wxDataObject *WXUNUSED(dataObject))
+{
+}
+
+bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+{
+    return false;
+}
+
+wxDragResult wxDropTarget::OnData(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult WXUNUSED(def))
+{
+    return wxDragResult();
+}
+
+bool wxDropTarget::GetData()
+{
+    return false;
+}
+
+wxDataFormat wxDropTarget::GetMatchingPair()
+{
+    wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/qt/dnd.cpp");
+    return wxDF_INVALID;
+}
+
+//##############################################################################
+
+
+wxDropSource::wxDropSource( wxWindow *WXUNUSED(win),
+              const wxIcon &WXUNUSED(copy),
+              const wxIcon &WXUNUSED(move),
+              const wxIcon &WXUNUSED(none))
+{
+}
+
+wxDropSource::wxDropSource( wxDataObject& WXUNUSED(data),
+              wxWindow *WXUNUSED(win),
+              const wxIcon &WXUNUSED(copy),
+              const wxIcon &WXUNUSED(move),
+              const wxIcon &WXUNUSED(none))
+{
+}
+
+wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
+{
+    return wxDragResult();
+}
+
diff --git a/src/qt/dvrenderer.cpp b/src/qt/dvrenderer.cpp
new file mode 100644
index 0000000000..a960b18e32
--- /dev/null
+++ b/src/qt/dvrenderer.cpp
@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dvrenderer.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DATAVIEWCTRL
+
+#include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
+wxDataViewRenderer::wxDataViewRenderer( const wxString &variantType,
+                    wxDataViewCellMode mode,
+                    int align)
+    : wxDataViewRendererBase( variantType, mode, align )
+{
+}
+
+void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
+{
+}
+
+wxDataViewCellMode wxDataViewRenderer::GetMode() const
+{
+    return wxDataViewCellMode();
+}
+
+void wxDataViewRenderer::SetAlignment( int align )
+{
+}
+
+int wxDataViewRenderer::GetAlignment() const
+{
+    return 0;
+}
+
+void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
+{
+}
+
+wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
+{
+    return wxEllipsizeMode();
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL
diff --git a/src/qt/dvrenderers.cpp b/src/qt/dvrenderers.cpp
new file mode 100644
index 0000000000..6afc6a415c
--- /dev/null
+++ b/src/qt/dvrenderers.cpp
@@ -0,0 +1,261 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dvrenderers.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DATAVIEWCTRL
+
+#include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
+wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
+                        wxDataViewCellMode mode,
+                        int align)
+    : wxDataViewRenderer( varianttype, mode, align )
+{
+}
+
+bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+void wxDataViewTextRenderer::SetAlignment( int align )
+{
+}
+
+//==============================================================================
+
+wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
+                          wxDataViewCellMode mode,
+                          int align)
+    : wxDataViewRenderer( varianttype, mode, align )
+{
+}
+
+bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewBitmapRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+//==============================================================================
+
+wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &variantType, wxDataViewCellMode mode,
+        int align,bool no_init )
+    : wxDataViewRenderer( variantType, mode, align )
+{
+
+}
+
+wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
+{
+
+}
+
+
+bool wxDataViewCustomRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    return false;
+}
+
+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,  wxRect cell, wxDC *dc, int state )
+{
+
+}
+
+wxSize wxDataViewCustomRenderer::GetSize() const
+{
+    return wxSize();
+}
+
+
+wxDC *wxDataViewCustomRenderer::GetDC()
+{
+    return NULL;
+}
+
+//==============================================================================
+
+wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
+                          wxDataViewCellMode mode,
+                          int align)
+    : wxDataViewRenderer( varianttype, mode, align )
+{
+}
+
+bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewToggleRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+//==============================================================================
+
+wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
+        const wxString &varianttype, wxDataViewCellMode mode, int align )
+    : wxDataViewCustomRenderer( varianttype, mode, align )
+{
+
+}
+wxDataViewProgressRenderer::~wxDataViewProgressRenderer()
+{
+
+}
+
+bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    return false;
+}
+
+wxSize wxDataViewProgressRenderer::GetSize() const
+{
+    return wxSize();
+}
+
+//==============================================================================
+
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( const wxString &varianttype,
+        wxDataViewCellMode mode, int align )
+    : wxDataViewCustomRenderer( varianttype, mode, align )
+{
+
+}
+
+wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
+{
+
+}
+
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    return false;
+}
+
+wxSize wxDataViewIconTextRenderer::GetSize() const
+{
+    return wxSize();
+}
+
+wxControl *wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+{
+    return NULL;
+}
+
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+{
+    return false;
+}
+
+//==============================================================================
+
+wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype,
+        wxDataViewCellMode mode, int align )
+    : wxDataViewCustomRenderer( varianttype, mode, align )
+{
+
+}
+
+
+bool wxDataViewDateRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+    return false;
+}
+
+wxSize wxDataViewDateRenderer::GetSize() const
+{
+    return wxSize();
+}
+
+bool wxDataViewDateRenderer::Activate( wxRect cell, wxDataViewModel *model,
+        const wxDataViewItem &item, unsigned int col )
+{
+    return false;
+}
+
+//==============================================================================
+
+wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices,
+        wxDataViewCellMode mode, int alignment )
+    : wxDataViewCustomRenderer(wxT("string"), mode, alignment )
+{
+
+}
+
+bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
+{
+    return false;
+}
+
+wxSize wxDataViewChoiceRenderer::GetSize() const
+{
+    return wxSize();
+}
+
+bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
+{
+    return false;
+}
+
+bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
+{
+    return false;
+}
+
+void wxDataViewChoiceRenderer::SetAlignment( int align )
+{
+
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL
diff --git a/src/qt/evtloop.cpp b/src/qt/evtloop.cpp
new file mode 100644
index 0000000000..0e3aa1803d
--- /dev/null
+++ b/src/qt/evtloop.cpp
@@ -0,0 +1,255 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/evtloop.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/app.h"
+#include "wx/apptrait.h"
+#include "wx/evtloop.h"
+#include "wx/private/eventloopsourcesmanager.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QSocketNotifier>
+
+wxQtIdleTimer::wxQtIdleTimer( wxQtEventLoopBase *eventLoop )
+{
+    m_eventLoop = eventLoop;
+
+    connect( this, &QTimer::timeout, this, &wxQtIdleTimer::idle );
+    setSingleShot( true );
+    start( 0 );
+}
+
+bool wxQtIdleTimer::eventFilter( QObject *WXUNUSED( watched ), QEvent *WXUNUSED( event ) )
+{
+    // Called for each Qt event, start with timeout 0 (run as soon as idle)
+    if ( !isActive() )
+        start( 0 );
+
+    return false; // Continue handling the event
+}
+
+void wxQtIdleTimer::idle()
+{
+    // Process pending events
+    if ( wxTheApp )
+        wxTheApp->ProcessPendingEvents();
+    
+    // Send idle event
+    if ( m_eventLoop->ProcessIdle() )
+        start( 0 );
+}
+
+wxQtEventLoopBase::wxQtEventLoopBase()
+{
+    // We need a QCoreApplication for event loops, create it here if it doesn't
+    // already exist as we can't modify wxConsoleApp
+    if ( !QCoreApplication::instance() )
+    {
+        new QApplication( wxAppConsole::GetInstance()->argc, wxAppConsole::GetInstance()->argv );
+    }
+    
+    // Create an idle timer to run each time there are no events (timeout = 0)
+    m_qtIdleTimer = new wxQtIdleTimer( this );
+
+    // Pass all events to the idle timer, so it can be restarted each time
+    // an event is received
+    qApp->installEventFilter( m_qtIdleTimer );
+}
+
+wxQtEventLoopBase::~wxQtEventLoopBase()
+{
+    delete m_qtIdleTimer;
+}
+
+void wxQtEventLoopBase::ScheduleExit(int rc)
+{
+    wxCHECK_RET( IsInsideRun(), wxT("can't call ScheduleExit() if not started") );
+    m_shouldExit = true;
+    QCoreApplication::exit( rc );
+}
+
+int wxQtEventLoopBase::DoRun()
+{
+    int ret;
+
+    // This is placed inside of a loop to take into account nested event loops
+    while ( !m_shouldExit )
+    {
+        // This will print Qt warnins if app already started:
+        // "QCoreApplication::exec: The event loop is already running"
+        // TODO: check the loopLevel (nested) like in wxGTK
+        ret = QCoreApplication::exec();
+        // process pending events (if exec was started previously)
+        // TODO: use a real new QEventLoop() ?
+        QCoreApplication::processEvents();
+    }
+    OnExit();
+    return ret;
+}
+
+bool wxQtEventLoopBase::Pending() const
+{
+    return QCoreApplication::hasPendingEvents();
+}
+
+bool wxQtEventLoopBase::Dispatch()
+{
+    QCoreApplication::processEvents();
+
+    return true;
+}
+
+int wxQtEventLoopBase::DispatchTimeout(unsigned long timeout)
+{
+    QCoreApplication::processEvents( QEventLoop::AllEvents, timeout );
+
+    return true;
+}
+
+void wxQtEventLoopBase::WakeUp()
+{
+    QAbstractEventDispatcher::instance()->wakeUp();
+}
+
+void wxQtEventLoopBase::DoYieldFor(long eventsToProcess)
+{
+    while (wxTheApp && wxTheApp->Pending())
+        // TODO: implement event filtering using the eventsToProcess mask
+        wxTheApp->Dispatch();
+
+    wxEventLoopBase::DoYieldFor(eventsToProcess);
+}
+
+#if wxUSE_EVENTLOOP_SOURCE
+
+template <void (wxEventLoopSourceHandler::*function)()>
+class wxQtSocketNotifier : public QSocketNotifier
+{
+public:
+    wxQtSocketNotifier(int fd, Type type, wxEventLoopSourceHandler *handler)
+        : QSocketNotifier(fd, type),
+          m_handler(handler)
+    {
+        setEnabled(true);
+
+        connect(this, &wxQtSocketNotifier::activated, this, &wxQtSocketNotifier::OnWaiting);
+    }
+
+    void OnWaiting()
+    {
+        (m_handler->*function)();
+    }
+
+    wxEventLoopSourceHandler *m_handler;
+};
+
+class wxQtEventLoopSource : public wxEventLoopSource
+{
+public:
+    wxQtSocketNotifier<&wxEventLoopSourceHandler::OnReadWaiting> * m_reader;
+    wxQtSocketNotifier<&wxEventLoopSourceHandler::OnWriteWaiting> * m_writer;
+    wxQtSocketNotifier<&wxEventLoopSourceHandler::OnExceptionWaiting> * m_exception;
+
+    wxQtEventLoopSource(int fd, wxEventLoopSourceHandler *handler, int flags)
+        : wxEventLoopSource(handler, fd)
+    {
+        if ( flags & wxEVENT_SOURCE_INPUT )
+            m_reader = new wxQtSocketNotifier<&wxEventLoopSourceHandler::OnReadWaiting>
+                (fd, QSocketNotifier::Read, handler);
+        else
+            m_reader = NULL;
+
+        if ( flags & wxEVENT_SOURCE_OUTPUT )
+            m_writer = new wxQtSocketNotifier<&wxEventLoopSourceHandler::OnWriteWaiting>
+                (fd, QSocketNotifier::Write, handler);
+        else
+            m_writer = NULL;
+
+        if ( flags & wxEVENT_SOURCE_EXCEPTION )
+            m_exception = new wxQtSocketNotifier<&wxEventLoopSourceHandler::OnExceptionWaiting>
+                (fd, QSocketNotifier::Exception, handler);
+        else
+            m_exception = NULL;
+    }
+
+    virtual ~wxQtEventLoopSource()
+    {
+        // clean up notifiers
+        if (m_reader)
+            delete m_reader;
+        if (m_writer)
+            delete m_writer;
+        if (m_exception)
+            delete m_exception;
+    }
+};
+
+class wxQtEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
+{
+public:
+    wxEventLoopSource*
+    AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags)
+    {
+        return new wxQtEventLoopSource(fd, handler, flags);
+    }
+};
+
+wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
+{
+    static wxQtEventLoopSourcesManager s_eventLoopSourcesManager;
+    return &s_eventLoopSourcesManager;
+}
+
+#if !wxUSE_CONSOLE_EVENTLOOP
+
+// Use the GUI event loop sources manager if console support is disabled
+// (needed by some common code, will raise an undefinied reference if not done)
+
+wxEventLoopSourcesManagerBase* wxAppTraits::GetEventLoopSourcesManager()
+{
+    static wxQtEventLoopSourcesManager s_eventLoopSourcesManager;
+    return &s_eventLoopSourcesManager;
+}
+
+#endif
+
+wxEventLoopSource *wxQtEventLoopBase::AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags)
+{
+    wxGUIAppTraits *AppTraits = dynamic_cast<wxGUIAppTraits *>(wxApp::GetTraitsIfExists());
+
+    if(AppTraits)
+        return AppTraits->GetEventLoopSourcesManager()->AddSourceForFD(fd, handler, flags);
+
+    return NULL;
+}
+
+#endif // wxUSE_EVENTLOOP_SOURCE
+
+//#############################################################################
+
+#if wxUSE_GUI
+
+wxGUIEventLoop::wxGUIEventLoop()
+{
+}
+
+#else // !wxUSE_GUI
+
+//#############################################################################
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+wxConsoleEventLoop::wxConsoleEventLoop()
+{
+}
+
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif // wxUSE_GUI
diff --git a/src/qt/filedlg.cpp b/src/qt/filedlg.cpp
new file mode 100644
index 0000000000..e6424c7d3e
--- /dev/null
+++ b/src/qt/filedlg.cpp
@@ -0,0 +1,244 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/filedlg.cpp
+// Author:      Sean D'Epagnier
+// Copyright:   (c) 2014 Sean D'Epagnier
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/filename.h"
+
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include "wx/filedlg.h"
+#include "wx/dirdlg.h"
+
+#include <QtWidgets/QFileDialog>
+
+class wxQtFileDialog : public wxQtEventSignalHandler< QFileDialog, wxDialog >
+{
+public:
+    wxQtFileDialog( wxWindow *parent, wxDialog *handler,
+                    const wxString& message, const wxString& defaultDir,
+                    const wxString& defaultFile, const wxString& wildCard, long style )
+        : wxQtEventSignalHandler(parent, handler)
+    {
+        setLabelText(QFileDialog::LookIn, wxQtConvertString(message));
+        setDirectory(wxQtConvertString(defaultDir));
+        selectFile(wxQtConvertString(defaultFile));
+
+        SetWildcard(wildCard);
+
+        if (style & wxFD_FILE_MUST_EXIST)
+            setFileMode(ExistingFile);
+        else if (style & wxFD_MULTIPLE)
+            setFileMode(ExistingFiles);
+
+        if (style & wxFD_SAVE)
+            setAcceptMode(AcceptSave);
+            
+        if (style & wxFD_CHANGE_DIR)
+            connect(this, &QDialog::accepted, this, &wxQtFileDialog::changeDirectory);
+    }
+
+    void SetWildcard(const wxString& wildCard)
+    {
+        QStringList wildCards = wxQtConvertString(wildCard).split("|");
+        QStringList filters;
+        for (int i=0; i<wildCards.size(); i+=2)
+            filters += wildCards.at(i);
+
+        setNameFilters(filters);
+    }
+
+    void changeDirectory()
+    {
+        wxSetWorkingDirectory(wxQtConvertString(directory().absolutePath()));
+    }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxDialog)
+
+wxFileDialog::wxFileDialog(wxWindow *parent,
+                           const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFile,
+                           const wxString& wildCard,
+                           long style,
+                           const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)
+{
+    Create(parent, message, defaultDir, defaultFile,
+           wildCard, style, pos, sz, name);
+}
+
+bool wxFileDialog::Create(wxWindow *parent,
+                          const wxString& message,
+                          const wxString& defaultDir,
+                          const wxString& defaultFile,
+                          const wxString& wildCard,
+                          long style,
+                          const wxPoint& pos,
+                          const wxSize& sz,
+                          const wxString& name)
+{
+    m_qtWindow = new wxQtFileDialog( parent, this, message, defaultDir,
+                                     defaultFile, wildCard, style);
+
+    return wxTopLevelWindow::Create( parent, wxID_ANY, message, pos, sz, style, name );
+}
+
+wxString wxFileDialog::GetPath() const
+{
+    wxArrayString paths;
+    GetPaths(paths);
+    if (paths.size() == 0)
+        return "";
+
+    return paths[0];
+}
+
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    QStringList selectedfiles = GetHandle()->selectedFiles();
+    foreach (QString file, selectedfiles)
+        paths.Add(wxQtConvertString(file));
+}
+
+wxString wxFileDialog::GetFilename() const
+{
+    wxArrayString filenames;
+    GetFilenames(filenames);
+    if(filenames.size() == 0)
+        return "";
+
+    return filenames[0];
+}
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    QStringList selectedfiles = GetHandle()->selectedFiles();
+    foreach (QString file, selectedfiles )
+    {
+        wxFileName fn = wxQtConvertString(file);
+        files.Add(fn.GetName());
+    }
+}
+
+int wxFileDialog::GetFilterIndex() const
+{
+    int index = 0;
+    foreach (QString filter, GetHandle()->nameFilters())
+    {
+        if (filter == GetHandle()->selectedNameFilter())
+            return index;
+        index++;
+    }
+
+    return -1;
+}
+
+void wxFileDialog::SetMessage(const wxString& message)
+{
+    GetHandle()->setLabelText(QFileDialog::LookIn, wxQtConvertString(message));
+}
+
+void wxFileDialog::SetPath(const wxString& path)
+{
+    GetHandle()->selectFile(wxQtConvertString(path));
+}
+
+void wxFileDialog::SetDirectory(const wxString& dir)
+{
+    GetHandle()->setDirectory(wxQtConvertString(dir));
+}
+
+void wxFileDialog::SetFilename(const wxString& name)
+{
+    SetPath(name);
+}
+
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+    GetHandle()->setNameFilter(wxQtConvertString(wildCard));
+}
+
+void wxFileDialog::SetFilterIndex(int filterIndex)
+{
+    QStringList filters = GetHandle()->nameFilters();
+    if (filterIndex < 0 || filterIndex >= filters.size())
+        return;
+
+    GetHandle()->setNameFilter(filters.at(filterIndex));
+}
+
+QFileDialog *wxFileDialog::GetHandle() const
+{
+    return static_cast<QFileDialog *>(m_qtWindow);
+}
+
+// Qt implements File and Dir Dialogs in the same class, so use a derived
+// helper class to save duplication
+class wxQtDirDialog : public wxQtFileDialog
+{
+public:
+    wxQtDirDialog(wxWindow *parent,
+                  wxDialog *handler,
+                  const wxString& message,
+                  const wxString& defaultPath,
+                  long style )
+
+        : wxQtFileDialog( parent, handler, message, defaultPath, "", "",
+                          (style & wxDD_DIR_MUST_EXIST ? wxFD_FILE_MUST_EXIST : 0) |
+                          (style & wxDD_CHANGE_DIR ? wxFD_CHANGE_DIR : 0 ))
+        {
+            setFileMode(QFileDialog::Directory);
+            setOption(ShowDirsOnly, true);
+        }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
+
+wxDirDialog::wxDirDialog(wxWindow *parent,
+                         const wxString& message,
+                         const wxString& defaultPath,
+                         long style,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         const wxString& name)
+{
+    Create(parent, message, defaultPath, style, pos, size, name);
+}
+
+bool wxDirDialog::Create(wxWindow *parent,
+                         const wxString& message,
+                         const wxString& defaultPath,
+                         long style,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         const wxString& name)
+{
+    m_qtWindow = new wxQtDirDialog( parent, this, message, defaultPath, style);
+    return wxTopLevelWindow::Create( parent, wxID_ANY, message, pos, size, style, name );
+}
+
+wxString wxDirDialog::GetPath() const
+{
+    QStringList selectedfiles = GetHandle()->selectedFiles();
+    if (selectedfiles.size() > 0)
+        return wxQtConvertString(selectedfiles.first());
+    return "";
+}
+
+void wxDirDialog::SetPath(const wxString& path)
+{
+    GetHandle()->selectFile(wxQtConvertString(path));
+}
+
+QFileDialog *wxDirDialog::GetHandle() const
+{
+    return static_cast<QFileDialog *>(m_qtWindow);
+}
diff --git a/src/qt/font.cpp b/src/qt/font.cpp
new file mode 100644
index 0000000000..c8e49ad319
--- /dev/null
+++ b/src/qt/font.cpp
@@ -0,0 +1,353 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/font.cpp
+// Author:      Peter Most, Mariano Reingart, Javier Torres
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/font.h"
+#include "wx/fontutil.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+
+#include <QtGui/QFont>
+#include <QtGui/QFontInfo>
+
+static QFont::StyleHint ConvertFontFamily(wxFontFamily family)
+{
+    switch (family)
+    {
+        case wxFONTFAMILY_DEFAULT:
+            return QFont::AnyStyle;
+
+        case wxFONTFAMILY_DECORATIVE:
+            return QFont::Decorative;
+
+        case wxFONTFAMILY_ROMAN:
+            return QFont::Serif;
+
+        case wxFONTFAMILY_SCRIPT:
+            return QFont::Decorative;
+
+        case wxFONTFAMILY_SWISS:
+            return QFont::SansSerif;
+
+        case wxFONTFAMILY_MODERN:
+            return QFont::TypeWriter;
+
+        case wxFONTFAMILY_TELETYPE:
+            return QFont::TypeWriter;
+
+        case wxFONTFAMILY_MAX:
+            wxFAIL_MSG( "Invalid font family value" );
+            break;
+    }
+    return QFont::AnyStyle;
+}
+
+static QFont::Weight ConvertFontWeight(wxFontWeight weight)
+{
+    switch (weight)
+    {
+        case wxFONTWEIGHT_NORMAL:
+            return QFont::Normal;
+
+        case wxFONTWEIGHT_LIGHT:
+            return QFont::Light;
+
+        case wxFONTWEIGHT_BOLD:
+            return QFont::Bold;
+
+        case wxFONTWEIGHT_MAX:
+            wxFAIL_MSG( "Invalid font weight value" );
+            break;
+    }
+    return QFont::Normal;
+}
+
+class wxFontRefData: public wxGDIRefData
+{
+    public:
+        wxFontRefData()
+        {
+        }
+
+        wxFontRefData(int size, QFont::StyleHint family, bool italic, QFont::Weight weight, bool underlined, QString face)
+        {
+            if (!face.isEmpty())
+                m_qtFont.setFamily(face);
+            else
+            {
+                m_qtFont.setStyleHint(family);
+                // force qt to choose a font using the hint:
+                m_qtFont.setFamily("");
+            }
+            m_qtFont.setItalic(italic);
+            m_qtFont.setWeight(weight);
+            m_qtFont.setUnderline(underlined);
+            m_qtFont.setPointSize(size);
+        }
+
+        wxFontRefData( const wxFontRefData& data )
+        : wxGDIRefData()
+        {
+            m_qtFont = data.m_qtFont;
+        }
+
+        bool operator == (const wxFontRefData& data) const
+        {
+            return m_qtFont == data.m_qtFont;
+        }
+        
+        QFont m_qtFont;
+};
+
+#define M_FONTDATA ((wxFontRefData *)m_refData)->m_qtFont
+
+wxFont::wxFont()
+{
+    m_refData = new wxFontRefData();
+}
+
+wxFont::wxFont(const wxFontInfo& info)
+{
+    Create(wxSize(0, info.GetPointSize()),
+           info.GetFamily(),
+           info.GetStyle(),
+           info.GetWeight(),
+           info.IsUnderlined(),
+           info.GetFaceName(),
+           info.GetEncoding());
+
+    SetStrikethrough(info.IsStrikethrough());
+
+    wxSize pixelSize = info.GetPixelSize();
+    if ( pixelSize != wxDefaultSize )
+        SetPixelSize(pixelSize);
+}
+
+wxFont::wxFont(const wxString& nativeFontInfoString)
+{
+    m_refData = new wxFontRefData();
+
+    QFont font;
+    font.fromString(wxQtConvertString( nativeFontInfoString ));
+    M_FONTDATA = font;
+}
+
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+    Create(wxSize(0, info.pointSize), info.family, info.style, info.weight, info.underlined, info.faceName, info.encoding);
+}
+
+wxFont::wxFont(const QFont& font)
+{
+    m_refData = new wxFontRefData();
+
+    M_FONTDATA = font;
+}
+
+wxFont::wxFont(int size,
+       wxFontFamily family,
+       wxFontStyle style,
+       wxFontWeight weight,
+       bool underlined,
+       const wxString& face,
+       wxFontEncoding encoding)
+{
+    Create(wxSize(0, size), family, style, weight, underlined, face, encoding);
+}
+
+wxFont::wxFont(const wxSize& pixelSize,
+       wxFontFamily family,
+       wxFontStyle style,
+       wxFontWeight weight,
+       bool underlined,
+       const wxString& face,
+       wxFontEncoding encoding)
+{
+    Create(pixelSize, family, style, weight, underlined, face, encoding);
+}
+
+wxFont::wxFont(int size,
+       int family,
+       int style,
+       int weight,
+       bool underlined,
+       const wxString& face,
+       wxFontEncoding encoding)
+{
+    Create(wxSize(0, size), (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
+}
+
+
+bool wxFont::Create(wxSize size, wxFontFamily family, wxFontStyle style,
+        wxFontWeight weight, bool underlined, const wxString& face,
+        wxFontEncoding WXUNUSED(encoding) )
+{
+    m_refData = new wxFontRefData(size.GetHeight(), ConvertFontFamily(family), style != wxFONTSTYLE_NORMAL,
+                                  ConvertFontWeight(weight), underlined, wxQtConvertString(face));
+
+    return true;
+}
+
+int wxFont::GetPointSize() const
+{
+    return M_FONTDATA.pointSize();
+}
+
+wxFontStyle wxFont::GetStyle() const
+{
+    switch (M_FONTDATA.style())
+    {
+        case QFont::StyleNormal:
+            return wxFONTSTYLE_NORMAL;
+
+        case QFont::StyleItalic:
+            return wxFONTSTYLE_ITALIC;
+
+        case QFont::StyleOblique:
+            return wxFONTSTYLE_SLANT;
+    }
+    wxFAIL_MSG( "Invalid font style value" );
+    return wxFontStyle();
+}
+
+wxFontWeight wxFont::GetWeight() const
+{
+    switch ( M_FONTDATA.weight() )
+    {
+        case QFont::Normal:
+            return wxFONTWEIGHT_NORMAL;
+
+        case QFont::Light:
+            return wxFONTWEIGHT_LIGHT;
+
+        case QFont::DemiBold:
+        case QFont::Black:
+        case QFont::Bold:
+            return wxFONTWEIGHT_BOLD;
+    }
+    wxFAIL_MSG( "Invalid font weight value" );
+    return wxFontWeight();
+}
+
+bool wxFont::GetUnderlined() const
+{
+    return M_FONTDATA.underline();
+}
+
+wxString wxFont::GetFaceName() const
+{
+    // use font info to get the matched face name (not the family given)
+    QFontInfo info = QFontInfo(M_FONTDATA);
+    return wxQtConvertString(info.family());
+}
+
+wxFontEncoding wxFont::GetEncoding() const
+{
+    QFontInfo info = QFontInfo(M_FONTDATA);
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+
+    return wxFontEncoding();
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+
+    return new wxNativeFontInfo();
+}
+
+
+void wxFont::SetPointSize( int pointSize )
+{
+    AllocExclusive();
+    M_FONTDATA.setPointSize(pointSize);
+}
+
+bool wxFont::SetFaceName(const wxString& facename)
+{
+    AllocExclusive();
+    M_FONTDATA.setFamily(wxQtConvertString(facename));
+    // qt uses a "font matching algoritm" so the font will be allways valid
+    return true;
+}
+
+void wxFont::SetFamily( wxFontFamily family )
+{
+    AllocExclusive();
+    M_FONTDATA.setStyleHint(ConvertFontFamily(family));
+    // reset the face name to force qt to choose a new font
+    M_FONTDATA.setFamily("");
+}
+
+void wxFont::SetStyle( wxFontStyle style )
+{
+    AllocExclusive();
+    M_FONTDATA.setItalic(style != wxFONTSTYLE_NORMAL);
+}
+
+void wxFont::SetWeight( wxFontWeight weight )
+{
+    AllocExclusive();
+    M_FONTDATA.setWeight(ConvertFontWeight(weight));
+}
+
+void wxFont::SetUnderlined( bool underlined )
+{
+    AllocExclusive();
+    M_FONTDATA.setUnderline(underlined);
+}
+
+void wxFont::SetEncoding(wxFontEncoding WXUNUSED(encoding))
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+}
+
+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+    return NULL;
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*(wxFontRefData *)data);
+}
+
+
+QFont wxFont::GetHandle() const
+{
+    return M_FONTDATA;
+}
+
+wxFontFamily wxFont::DoGetFamily() const
+{
+    switch (M_FONTDATA.styleHint())
+    {
+        case QFont::System:
+        case QFont::AnyStyle:
+            return wxFONTFAMILY_DEFAULT;
+
+        case QFont::Fantasy:
+        case QFont::Cursive:
+        case QFont::Decorative:
+            return wxFONTFAMILY_DECORATIVE;
+
+        case QFont::Serif:
+            return wxFONTFAMILY_ROMAN;
+
+        case QFont::SansSerif:
+            return wxFONTFAMILY_SWISS;
+
+        case QFont::Monospace:
+        case QFont::TypeWriter:
+            return wxFONTFAMILY_TELETYPE;
+
+    }
+    return wxFONTFAMILY_UNKNOWN;
+}
diff --git a/src/qt/fontdlg.cpp b/src/qt/fontdlg.cpp
new file mode 100644
index 0000000000..f7f5b9acbc
--- /dev/null
+++ b/src/qt/fontdlg.cpp
@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/filedlg.cpp
+// Author:      Sean D'Epagnier
+// Copyright:   (c) 2014 Sean D'Epagnier
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/qt/private/winevent.h"
+#include "wx/fontdlg.h"
+
+class wxQtFontDialog : public wxQtEventSignalHandler< QFontDialog, wxFontDialog >
+{
+public:
+    wxQtFontDialog( wxWindow *parent, wxFontDialog *handler)
+        : wxQtEventSignalHandler(parent, handler)
+        {
+            connect(this, &QFontDialog::currentFontChanged, this, &wxQtFontDialog::updateFont);
+        }
+
+    void updateFont(const QFont &font)
+        {
+            GetHandler()->GetFontData().SetChosenFont(wxFont(font));
+        }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+
+bool wxFontDialog::DoCreate(wxWindow *parent)
+{
+    m_qtWindow = new wxQtFontDialog( parent, this );
+    GetHandle()->setCurrentFont(m_fontData.GetInitialFont().GetHandle());
+    return wxFontDialogBase::DoCreate(parent);
+}
+
+
diff --git a/src/qt/fontenum.cpp b/src/qt/fontenum.cpp
new file mode 100644
index 0000000000..c47692ee36
--- /dev/null
+++ b/src/qt/fontenum.cpp
@@ -0,0 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/fontenum.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/fontenum.h"
+
+bool wxFontEnumerator::EnumerateFacenames( wxFontEncoding WXUNUSED(encoding),
+                bool WXUNUSED(fixedWidthOnly))
+{
+    return false;
+}
+
+bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(facename))
+{
+    return false;
+}
+
+#ifdef wxHAS_UTF8_FONTS
+bool wxFontEnumerator::EnumerateEncodingsUTF8(const wxString& facename)
+{
+    return false;
+}
+#endif
diff --git a/src/qt/fontutil.cpp b/src/qt/fontutil.cpp
new file mode 100644
index 0000000000..d77d7dc77d
--- /dev/null
+++ b/src/qt/fontutil.cpp
@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/fontutil.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/fontutil.h"
+#include "wx/encinfo.h"
+
+bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
+{
+    return false;
+}
+
+wxString wxNativeEncodingInfo::ToString() const
+{
+    return wxString();
+}
+
+//#############################################################################
+
+bool wxGetNativeFontEncoding(wxFontEncoding WXUNUSED(encoding),
+                          wxNativeEncodingInfo *info)
+{
+    *info = wxNativeEncodingInfo();
+    
+    return false;
+}
+
+
+bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
+{
+    return false;
+}
+
diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
new file mode 100644
index 0000000000..3db48ae1d6
--- /dev/null
+++ b/src/qt/frame.cpp
@@ -0,0 +1,185 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/frame.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2009 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/frame.h"
+#include "wx/menu.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QScrollArea>
+
+
+class wxQtMainWindow : public wxQtEventSignalHandler< QMainWindow, wxFrame >
+{
+public:
+    wxQtMainWindow( wxWindow *parent, wxFrame *handler );
+
+private:
+};
+
+// Central widget helper (container to show scroll bars and receive events):
+
+class wxQtCentralWidget : public wxQtEventSignalHandler< QScrollArea, wxFrame >
+{
+    public:
+        wxQtCentralWidget( wxWindow *parent, wxFrame *handler );
+};
+
+
+wxFrame::wxFrame()
+{
+}
+
+wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString& title,
+        const wxPoint& pos, const wxSize& size, long style, const wxString& name )
+{
+    Create( parent, id, title, pos, size, style, name );
+}
+
+wxFrame::~wxFrame()
+{
+    // central widget should be deleted by qt when the main window is destroyed
+    QtStoreWindowPointer( GetHandle()->centralWidget(), NULL );
+}
+
+bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString& title,
+    const wxPoint& pos, const wxSize& size, long style, const wxString& name )
+{
+    m_qtWindow = new wxQtMainWindow( parent, this );
+
+    // TODO: Could we use a wxPanel as the central widget? If so then we could
+    // remove wxWindow::QtReparent.
+
+    GetHandle()->setCentralWidget( new wxQtCentralWidget( parent, this ) );
+
+    PostCreation();
+
+    return wxFrameBase::Create( parent, id, title, pos, size, style, name );
+}
+
+void wxFrame::SetMenuBar( wxMenuBar *menuBar )
+{
+    if ( menuBar )
+    {
+        // The current menu bar could be deleted by Qt when dereferencing it so
+        // then that QMenuBar will raise a segmentation fault when using it again
+        wxCHECK_RET( menuBar->GetHandle(),
+                     "Using a replaced menu bar is not supported in wxQT");
+        // Warning: Qt main window takes ownership of the QMenuBar pointer:
+        GetHandle()->setMenuBar( menuBar->GetHandle() );
+    }
+    else
+    {
+        // Creating an empty menu bar should hide it and free the previous:
+        QMenuBar *qmenubar = new QMenuBar(GetHandle());
+        GetHandle()->setMenuBar( qmenubar );
+    }
+    wxFrameBase::SetMenuBar( menuBar );
+}
+
+void wxFrame::SetStatusBar( wxStatusBar *statusBar )
+{
+    // The current status bar could be deleted by Qt when dereferencing it
+    // TODO: add a mechanism like Detach in menus to avoid issues
+    if ( statusBar != NULL )
+    {
+        GetHandle()->setStatusBar( statusBar->GetHandle() );
+        // Update statusbar sizes now that it has a size
+        statusBar->Refresh();
+    }
+    else
+    {
+        // Remove the current status bar
+        GetHandle()->setStatusBar(NULL);
+    }
+    wxFrameBase::SetStatusBar( statusBar );
+}
+
+void wxFrame::SetToolBar(wxToolBar *toolbar)
+{
+    int area = 0;
+    if ( toolbar != NULL )
+    {
+        if (toolbar->HasFlag(wxTB_LEFT))   area |= Qt::LeftToolBarArea;
+        if (toolbar->HasFlag(wxTB_RIGHT))  area |= Qt::RightToolBarArea;
+        if (toolbar->HasFlag(wxTB_TOP))    area |= Qt::TopToolBarArea;
+        if (toolbar->HasFlag(wxTB_BOTTOM)) area |= Qt::BottomToolBarArea;
+
+        GetHandle()->addToolBar((Qt::ToolBarArea)area, toolbar->GetHandle());
+    }
+    else if ( m_frameToolBar != NULL )
+    {
+        GetHandle()->removeToolBar(m_frameToolBar->GetHandle());
+    }
+    wxFrameBase::SetToolBar( toolbar );
+}
+
+void wxFrame::SetWindowStyleFlag( long style )
+{
+    wxWindow::SetWindowStyleFlag( style );
+
+    Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
+
+    wxCHECK_RET( !HasFlag( wxFRAME_FLOAT_ON_PARENT ) && !HasFlag( wxTINY_CAPTION ) ,
+                 "wxFRAME_FLOAT_ON_PARENT, wxTINY_CAPTION not supported. Use wxFRAME_TOOL_WINDOW instead." );
+    wxCHECK_RET( !HasFlag( wxFRAME_TOOL_WINDOW ) || HasFlag( wxFRAME_NO_TASKBAR ) ,
+                 "wxFRAME_TOOL_WINDOW without wxFRAME_NO_TASKBAR not supported." );
+
+    if ( HasFlag( wxFRAME_TOOL_WINDOW ) )
+    {
+        qtFlags &= ~Qt::WindowType_Mask;
+        qtFlags |= Qt::Tool;
+    }
+    else if ( HasFlag( wxFRAME_NO_TASKBAR ) )
+    {
+        qtFlags &= ~Qt::WindowType_Mask;
+        qtFlags |= Qt::Dialog;
+    }
+    
+    if ( ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )
+         != qtFlags.testFlag( Qt::FramelessWindowHint ) )
+    {
+        qtFlags ^= Qt::FramelessWindowHint;
+    }
+
+    GetHandle()->setWindowFlags( qtFlags );
+}
+
+void wxFrame::AddChild( wxWindowBase *child )
+{
+    // Make sure all children are children of the central widget:
+
+    QtReparent( child->GetHandle(), GetHandle()->centralWidget() );
+
+    wxFrameBase::AddChild( child );
+}
+
+void wxFrame::RemoveChild( wxWindowBase *child )
+{
+    wxFrameBase::RemoveChild( child );
+}
+
+QAbstractScrollArea *wxFrame::QtGetScrollBarsContainer() const
+{
+    return dynamic_cast <QAbstractScrollArea *> (GetHandle()->centralWidget() );
+}
+
+//=============================================================================
+
+wxQtMainWindow::wxQtMainWindow( wxWindow *parent, wxFrame *handler )
+    : wxQtEventSignalHandler< QMainWindow, wxFrame >( parent, handler )
+{
+//    setCentralWidget( new wxQtWidget( parent, handler ));
+}
+
+wxQtCentralWidget::wxQtCentralWidget( wxWindow *parent, wxFrame *handler )
+    : wxQtEventSignalHandler< QScrollArea, wxFrame >( parent, handler )
+{
+}
diff --git a/src/qt/gauge.cpp b/src/qt/gauge.cpp
new file mode 100644
index 0000000000..da3bbc9687
--- /dev/null
+++ b/src/qt/gauge.cpp
@@ -0,0 +1,91 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/gauge.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/gauge.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtProgressBar : public wxQtEventSignalHandler< QProgressBar, wxGauge >
+{
+public:
+    wxQtProgressBar( wxWindow *parent, wxGauge *handler );
+
+private:
+    void valueChanged(int value);
+};
+
+wxQtProgressBar::wxQtProgressBar( wxWindow *parent, wxGauge *handler )
+    : wxQtEventSignalHandler< QProgressBar, wxGauge >( parent, handler )
+{
+}
+
+
+wxGauge::wxGauge()
+{
+}
+
+wxGauge::wxGauge(wxWindow *parent,
+        wxWindowID id,
+        int range,
+        const wxPoint& pos,
+        const wxSize& size,
+        long style,
+        const wxValidator& validator,
+        const wxString& name)
+{
+    Create( parent, id, range, pos, size, style, validator, name );
+}
+
+bool wxGauge::Create(wxWindow *parent,
+            wxWindowID id,
+            int range,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    m_qtProgressBar = new wxQtProgressBar( parent, this);
+    m_qtProgressBar->setOrientation( wxQtConvertOrientation( style, wxGA_HORIZONTAL ));
+    m_qtProgressBar->setRange( 0, range );
+    m_qtProgressBar->setTextVisible( style & wxGA_TEXT );
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+
+QProgressBar *wxGauge::GetHandle() const
+{
+    return m_qtProgressBar;
+}
+
+// set/get the control range and value
+
+void wxGauge::SetRange(int range)
+{
+    // note that in wx minimun range is fixed at 0
+    m_qtProgressBar->setMaximum(range);
+}
+
+int wxGauge::GetRange() const
+{
+    return m_qtProgressBar->maximum();
+}
+
+void wxGauge::SetValue(int pos)
+{
+    m_qtProgressBar->setValue(pos);
+}
+
+int wxGauge::GetValue() const
+{
+    return m_qtProgressBar->value();
+}
diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp
new file mode 100644
index 0000000000..653b399af6
--- /dev/null
+++ b/src/qt/glcanvas.cpp
@@ -0,0 +1,253 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/glcanvas.cpp
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#if wxUSE_GLCANVAS
+
+#include "wx/qt/private/winevent.h"
+#include "wx/glcanvas.h"
+
+class wxQtGLWidget : public wxQtEventSignalHandler< QGLWidget, wxGLCanvas >
+{
+public:
+    wxQtGLWidget(wxWindow *parent, wxGLCanvas *handler, QGLFormat format)
+        : wxQtEventSignalHandler(parent, handler)
+        {
+            setFormat(format);
+            setAutoBufferSwap( false );
+        }
+
+protected:
+    virtual void showEvent ( QShowEvent * event );
+    virtual void hideEvent ( QHideEvent * event );
+    virtual void resizeEvent ( QResizeEvent * event );
+    virtual void paintEvent ( QPaintEvent * event );
+
+    virtual void resizeGL(int w, int h);
+    virtual void paintGL();
+};
+
+void wxQtGLWidget::showEvent ( QShowEvent * event )
+{
+    QGLWidget::showEvent( event );
+}
+
+void wxQtGLWidget::hideEvent ( QHideEvent * event )
+{
+    QGLWidget::hideEvent( event );
+}
+
+void wxQtGLWidget::resizeEvent ( QResizeEvent * event )
+{
+    QGLWidget::resizeEvent(event);
+}
+
+void wxQtGLWidget::paintEvent ( QPaintEvent * event )
+{
+    QGLWidget::paintEvent(event);
+}
+
+void wxQtGLWidget::resizeGL(int w, int h)
+{
+    wxSizeEvent event( wxSize(w, h) );
+    EmitEvent(event);
+}
+
+void wxQtGLWidget::paintGL()
+{
+    wxPaintEvent event( GetHandler()->GetId() );
+    EmitEvent(event);
+}
+
+//---------------------------------------------------------------------------
+// wxGlContext
+//---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxGLContext, wxWindow)
+
+wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other))
+{
+//    m_glContext = win->GetHandle()->context();
+}
+
+bool wxGLContext::SetCurrent(const wxGLCanvas&) const
+{
+// I think I must destroy and recreate the QGLWidget to change the context?
+//    win->GetHandle()->makeCurrent();
+    return false;
+}
+
+//---------------------------------------------------------------------------
+// wxGlCanvas
+//---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+
+wxGLCanvas::wxGLCanvas(wxWindow *parent,
+                       wxWindowID id,
+                       const int *attribList,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxString& name,
+                       const wxPalette& palette)
+{
+    Create(parent, id, pos, size, style, name, attribList, palette);
+}
+
+bool wxGLCanvas::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxString& name,
+                        const int *attribList,
+                        const wxPalette& palette)
+{
+#if wxUSE_PALETTE
+    wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
+#endif // wxUSE_PALETTE
+    wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0
+
+    QGLFormat format;
+    if (!wxGLCanvas::ConvertWXAttrsToQtGL(attribList, format))
+        return false;
+
+    m_qtWindow = new wxQtGLWidget(parent, this, format);
+
+    return wxWindow::Create( parent, id, pos, size, style, name );
+}
+
+bool wxGLCanvas::SwapBuffers()
+{
+    GetHandle()->swapBuffers();
+    return true;
+}
+
+/* static */
+bool wxGLCanvas::ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format)
+{
+    if (!wxattrs)
+        return true;
+    return true;
+
+    // set default parameters to false
+    format.setDoubleBuffer(false);
+    format.setDepth(false);
+    format.setAlpha(false);
+    format.setStencil(false);
+
+    for ( int arg = 0; wxattrs[arg] != 0; arg++ )
+    {
+        // indicates whether we have a boolean attribute
+        bool isBoolAttr = false;
+
+        int v = wxattrs[arg+1];
+        switch ( wxattrs[arg] )
+        {
+            case WX_GL_BUFFER_SIZE:
+                format.setRgba(false);
+                // I do not know how to set the buffer size, so fail
+                return false;
+
+            case WX_GL_LEVEL:
+                format.setPlane(v);
+                break;
+
+            case WX_GL_RGBA:
+                format.setRgba(true);
+                isBoolAttr = true;
+                break;
+
+            case WX_GL_DOUBLEBUFFER:
+                format.setDoubleBuffer(true);
+                isBoolAttr = true;
+                break;
+
+            case WX_GL_STEREO:
+                format.setStereo(true);
+                isBoolAttr = true;
+                break;
+
+            case WX_GL_AUX_BUFFERS:
+                // don't know how to implement
+                return false;
+
+            case WX_GL_MIN_RED:
+                format.setRedBufferSize(v*8);
+                break;
+
+            case WX_GL_MIN_GREEN:
+                format.setGreenBufferSize(v);
+                break;
+
+            case WX_GL_MIN_BLUE:
+                format.setBlueBufferSize(v);
+                break;
+
+            case WX_GL_MIN_ALPHA:
+                format.setAlpha(true);
+                format.setAlphaBufferSize(v);
+                break;
+
+            case WX_GL_DEPTH_SIZE:
+                format.setDepth(true);
+                format.setDepthBufferSize(v);
+                break;
+
+            case WX_GL_STENCIL_SIZE:
+                format.setStencil(true);
+                format.setStencilBufferSize(v);
+                break;
+
+            case WX_GL_MIN_ACCUM_RED:
+            case WX_GL_MIN_ACCUM_GREEN:
+            case WX_GL_MIN_ACCUM_BLUE:
+            case WX_GL_MIN_ACCUM_ALPHA:
+                format.setAccumBufferSize(v);
+                break;
+
+            case WX_GL_SAMPLE_BUFFERS:
+                format.setSampleBuffers(v);
+                // can we somehow indicate if it's not supported?
+                break;
+
+            case WX_GL_SAMPLES:
+                format.setSamples(v);
+                // can we somehow indicate if it's not supported?
+                break;
+
+            default:
+                wxLogDebug(wxT("Unsupported OpenGL attribute %d"),
+                           wxattrs[arg]);
+                continue;
+        }
+
+        if ( !isBoolAttr ) {
+            if(!v)
+                return false; // zero parameter
+            arg++;
+        }
+    }
+
+    return true;
+}
+
+/* static */
+bool
+wxGLCanvasBase::IsDisplaySupported(const int *attribList)
+{
+    QGLFormat format;
+
+    if (!wxGLCanvas::ConvertWXAttrsToQtGL(attribList, format))
+        return false;
+
+    return QGLWidget(format).isValid();
+}
+
+#endif // wxUSE_GLCANVAS
diff --git a/src/qt/listbox.cpp b/src/qt/listbox.cpp
new file mode 100644
index 0000000000..6ab1a2ab2a
--- /dev/null
+++ b/src/qt/listbox.cpp
@@ -0,0 +1,241 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/listbox.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/listbox.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtListWidget : public wxQtEventSignalHandler< QListWidget, wxListBox >
+{
+public:
+    wxQtListWidget( wxWindow *parent, wxListBox *handler );
+
+private:
+    void clicked( const QModelIndex &index );
+    void doubleClicked( const QModelIndex &index );
+};
+
+wxQtListWidget::wxQtListWidget( wxWindow *parent, wxListBox *handler )
+    : wxQtEventSignalHandler< QListWidget, wxListBox >( parent, handler )
+{
+    connect(this, &QListWidget::clicked, this, &wxQtListWidget::clicked);
+    connect(this, &QListWidget::doubleClicked, this, &wxQtListWidget::doubleClicked);
+}
+
+void wxQtListWidget::clicked(const QModelIndex &index )
+{
+    wxListBox *handler = GetHandler();
+    if ( handler )
+        handler->QtSendEvent(wxEVT_LISTBOX, index, true);
+}
+
+void wxQtListWidget::doubleClicked( const QModelIndex &index )
+{
+    wxListBox *handler = GetHandler();
+    if ( handler )
+        handler->QtSendEvent(wxEVT_LISTBOX_DCLICK, index, true);
+}
+
+
+wxListBox::wxListBox()
+{
+    Init();
+}
+
+wxListBox::wxListBox(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        int n, const wxString choices[],
+        long style,
+        const wxValidator& validator,
+        const wxString& name)
+{
+    Create( parent, id, pos, size, n, choices, style, validator, name );
+}
+
+wxListBox::wxListBox(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style,
+        const wxValidator& validator,
+        const wxString& name)
+{
+    Create( parent, id, pos, size, choices, style, validator, name );
+}
+
+wxListBox::~wxListBox()
+{
+    Clear();
+}
+
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            int n, const wxString choices[],
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    Init();
+    QListWidgetItem* item;
+    m_qtListWidget = new wxQtListWidget( parent, this );
+
+    while ( n-- > 0 )
+    {
+        item = new QListWidgetItem();
+        item->setText(wxQtConvertString( *choices++ ));
+        if ( m_hasCheckBoxes )
+        {
+            item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+            item->setCheckState(Qt::Unchecked);
+        }
+        m_qtListWidget->addItem(item);
+    }
+    return wxListBoxBase::Create( parent, id, pos, size, style, validator, name );
+}
+
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& WXUNUSED(choices),
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    Init();
+    m_qtWindow = m_qtListWidget = new wxQtListWidget( parent, this );
+
+    return wxListBoxBase::Create( parent, id, pos, size, style, validator, name );
+}
+
+void wxListBox::Init()
+{
+#if wxUSE_CHECKLISTBOX
+    m_hasCheckBoxes = false;
+#endif // wxUSE_CHECKLISTBOX
+}
+
+bool wxListBox::IsSelected(int n) const
+{
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    return item->isSelected();
+}
+
+int wxListBox::GetSelections(wxArrayInt& WXUNUSED(aSelections)) const
+{
+    return 0;
+}
+
+unsigned wxListBox::GetCount() const
+{
+    return m_qtListWidget->count();
+}
+
+wxString wxListBox::GetString(unsigned int n) const
+{    
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    wxCHECK_MSG(item != NULL, wxString(), wxT("wrong listbox index") );
+    return wxQtConvertString( item->text() );
+}
+
+void wxListBox::SetString(unsigned int n, const wxString& WXUNUSED(s))
+{
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    wxCHECK_RET(item != NULL, wxT("wrong listbox index") );
+    if ( m_hasCheckBoxes )
+    {
+        item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+        item->setCheckState(Qt::Unchecked);
+    }
+}
+
+void wxListBox::SetSelection(int n)
+{
+    return m_qtListWidget->setCurrentRow(n);
+}
+
+int wxListBox::GetSelection() const
+{
+    return m_qtListWidget->currentIndex().row();
+}
+
+void wxListBox::DoSetFirstItem(int WXUNUSED(n))
+{
+}
+
+void wxListBox::DoSetSelection(int n, bool select)
+{
+    return m_qtListWidget->setCurrentRow(n, select ? QItemSelectionModel::Select : QItemSelectionModel::Deselect );
+}
+
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                          unsigned int pos,
+                          void **clientData,
+                          wxClientDataType type)
+{
+    InvalidateBestSize();
+    int n = DoInsertItemsInLoop(items, pos, clientData, type);
+    UpdateOldSelections();
+    return n;
+}
+
+int wxListBox::DoInsertOneItem(const wxString& text, unsigned int pos)
+{
+    QListWidgetItem* item = new QListWidgetItem();
+    item->setText(wxQtConvertString( text ));
+    if ( m_hasCheckBoxes )
+    {
+        item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+        item->setCheckState(Qt::Unchecked);
+    }
+    m_qtListWidget->insertItem(pos, item);
+    return pos;
+}
+
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
+{
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    QVariant variant = qVariantFromValue(clientData);
+    item->setData(Qt::UserRole, variant);
+}
+
+void *wxListBox::DoGetItemClientData(unsigned int n) const
+{
+    QListWidgetItem* item = m_qtListWidget->item(n);
+    QVariant variant = item->data(Qt::UserRole);
+    return variant.value<void *>();
+}
+
+void wxListBox::DoClear()
+{
+    m_qtListWidget->clear();
+}
+
+void wxListBox::DoDeleteOneItem(unsigned int pos)
+{
+    QListWidgetItem* item = m_qtListWidget->item(pos);
+    delete item;
+}
+
+QListWidget *wxListBox::GetHandle() const
+{
+    return m_qtListWidget;
+}
+
+void wxListBox::QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected)
+{
+    SendEvent(evtType, index.row(), selected);
+}
+
+QScrollArea *wxListBox::QtGetScrollBarsContainer() const
+{
+    return (QScrollArea *) m_qtListWidget;
+}
diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp
new file mode 100644
index 0000000000..2a5d3d7feb
--- /dev/null
+++ b/src/qt/listctrl.cpp
@@ -0,0 +1,917 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/listctrl.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/listctrl.h"
+#include "wx/imaglist.h"
+#include "wx/qt/private/winevent.h"
+
+#include <QHeaderView>
+
+
+class wxQtTreeWidget : public wxQtEventSignalHandler< QTreeWidget, wxListCtrl >
+{
+public:
+    wxQtTreeWidget( wxWindow *parent, wxListCtrl *handler );
+
+    void EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int column) const;
+
+private:
+    void itemClicked(QTreeWidgetItem * item, int column);
+    void itemActivated(QTreeWidgetItem * item, int column);
+    void itemPressed(QTreeWidgetItem * item, int column);
+};
+
+wxQtTreeWidget::wxQtTreeWidget( wxWindow *parent, wxListCtrl *handler )
+    : wxQtEventSignalHandler< QTreeWidget, wxListCtrl >( parent, handler )
+{
+    connect(this, &QTreeWidget::itemClicked, this, &wxQtTreeWidget::itemClicked);
+    connect(this, &QTreeWidget::itemPressed, this, &wxQtTreeWidget::itemPressed);
+    connect(this, &QTreeWidget::itemActivated, this, &wxQtTreeWidget::itemActivated);
+}
+
+void wxQtTreeWidget::EmitListEvent(wxEventType typ, QTreeWidgetItem *qitem, int column) const
+{
+    wxListCtrl *handler = GetHandler();
+    if ( handler )
+    {
+        // prepare the event
+        // -----------------
+        wxListEvent event;
+        event.SetEventType(typ);
+        event.SetId(handler->GetId());
+        event.m_itemIndex = this->indexFromItem(qitem, column).row();
+        event.m_item.SetId(event.m_itemIndex);
+        event.m_item.SetMask(wxLIST_MASK_TEXT |
+                             wxLIST_MASK_IMAGE |
+                             wxLIST_MASK_DATA);
+        handler->GetItem(event.m_item);
+        EmitEvent(event);
+    }
+}
+
+void wxQtTreeWidget::itemClicked(QTreeWidgetItem *qitem, int column)
+{
+    EmitListEvent(wxEVT_LIST_ITEM_SELECTED, qitem, column);
+}
+
+void wxQtTreeWidget::itemPressed(QTreeWidgetItem *qitem, int column)
+{
+    EmitListEvent(wxEVT_LIST_ITEM_SELECTED, qitem, column);
+}
+
+void wxQtTreeWidget::itemActivated(QTreeWidgetItem *qitem, int column)
+{
+    EmitListEvent(wxEVT_LIST_ITEM_ACTIVATED, qitem, column);
+}
+
+
+Qt::AlignmentFlag wxQtConvertTextAlign(wxListColumnFormat align)
+{
+    switch (align)
+    {
+        case wxLIST_FORMAT_LEFT:
+            return Qt::AlignLeft;
+        case wxLIST_FORMAT_RIGHT:
+            return Qt::AlignRight;
+        case wxLIST_FORMAT_CENTRE:
+            return Qt::AlignCenter;
+    }
+    return Qt::AlignLeft;
+}
+
+wxListColumnFormat wxQtConvertAlignFlag(int align)
+{
+    switch (align)
+    {
+        case Qt::AlignLeft:
+            return wxLIST_FORMAT_LEFT;
+        case Qt::AlignRight:
+            return wxLIST_FORMAT_RIGHT;
+        case Qt::AlignCenter:
+            return wxLIST_FORMAT_CENTRE;
+    }
+    return wxLIST_FORMAT_LEFT;
+}
+
+
+wxListCtrl::wxListCtrl()
+{
+    Init();
+}
+
+wxListCtrl::wxListCtrl(wxWindow *parent,
+           wxWindowID id,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    Init();
+    Create( parent, id, pos, size, style, validator, name );
+}
+
+
+bool wxListCtrl::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    m_qtTreeWidget = new wxQtTreeWidget( parent, this );
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+void wxListCtrl::Init()
+{
+    m_imageListNormal = NULL;
+    m_ownsImageListNormal = false;
+    m_imageListSmall = NULL;
+    m_ownsImageListSmall = false;
+    m_imageListState = NULL;
+    m_ownsImageListState = false;
+}
+
+wxListCtrl::~wxListCtrl()
+{
+
+    if (m_ownsImageListNormal)
+        delete m_imageListNormal;
+    if (m_ownsImageListSmall)
+        delete m_imageListSmall;
+    if (m_ownsImageListState)
+        delete m_imageListState;
+}
+
+bool wxListCtrl::SetForegroundColour(const wxColour& col)
+{
+    return wxListCtrlBase::SetForegroundColour(col);
+}
+
+bool wxListCtrl::SetBackgroundColour(const wxColour& col)
+{
+    return wxListCtrlBase::SetBackgroundColour(col);
+}
+
+bool wxListCtrl::GetColumn(int col, wxListItem& info) const
+{
+    QTreeWidgetItem *qitem = m_qtTreeWidget->headerItem();
+    if ( qitem != NULL )
+    {
+        info.SetText(wxQtConvertString(qitem->text(col)));
+        info.SetAlign(wxQtConvertAlignFlag(qitem->textAlignment(col)));
+        info.SetWidth(m_qtTreeWidget->columnWidth(col));
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::SetColumn(int col, const wxListItem& info)
+{
+    DoInsertColumn(col, info);
+    return true;
+}
+
+int wxListCtrl::GetColumnWidth(int col) const
+{
+    return m_qtTreeWidget->columnWidth(col);
+}
+
+bool wxListCtrl::SetColumnWidth(int col, int width)
+{
+    m_qtTreeWidget->setColumnWidth(col, width);
+    return true;
+}
+
+int wxListCtrl::GetColumnOrder(int col) const
+{
+    return col;
+}
+
+int wxListCtrl::GetColumnIndexFromOrder(int order) const
+{
+    return order;
+}
+
+wxArrayInt wxListCtrl::GetColumnsOrder() const
+{
+    return wxArrayInt();
+}
+
+bool wxListCtrl::SetColumnsOrder(const wxArrayInt& WXUNUSED(orders))
+{
+    return false;
+}
+
+int wxListCtrl::GetCountPerPage() const
+{
+    // this may not be exact but should be a good aproximation:
+    int h = m_qtTreeWidget->visualItemRect(m_qtTreeWidget->headerItem()).height();
+    if ( h )
+        return m_qtTreeWidget->height() / h;
+    else
+        return 0;
+}
+
+wxRect wxListCtrl::GetViewRect() const
+{
+    // this may not be exact but should be a good aproximation:
+    wxRect rect = wxQtConvertRect(m_qtTreeWidget->rect());
+    int h = m_qtTreeWidget->header()->defaultSectionSize();
+    rect.SetTop(h);
+    rect.SetHeight(rect.GetHeight() - h);
+    return rect;
+}
+
+wxTextCtrl* wxListCtrl::GetEditControl() const
+{
+    return NULL;
+}
+
+QTreeWidgetItem *wxListCtrl::QtGetItem(int id) const
+{
+    wxCHECK_MSG( id >= 0 && id < GetItemCount(), NULL,
+                 wxT("invalid item index in wxListCtrl") );
+    QModelIndex index = m_qtTreeWidget->model()->index(id, 0);
+    // note that itemFromIndex(index) is protected
+    return (QTreeWidgetItem*)index.internalPointer();
+}
+
+bool wxListCtrl::GetItem(wxListItem& info) const
+{
+    const long id = info.GetId();
+    QTreeWidgetItem *qitem = QtGetItem(id);
+    if ( qitem != NULL )
+    {
+        if ( !info.m_mask )
+            // by default, get everything for backwards compatibility
+            info.m_mask = -1;
+        if ( info.m_mask & wxLIST_MASK_TEXT )
+            info.SetText(wxQtConvertString(qitem->text(info.GetColumn())));
+        if ( info.m_mask & wxLIST_MASK_DATA )
+        {
+            QVariant variant = qitem->data(0, Qt::UserRole);
+            info.SetData(variant.value<long>());
+        }
+        if ( info.m_mask & wxLIST_MASK_STATE )
+        {
+            info.m_state = wxLIST_STATE_DONTCARE;
+            if ( info.m_stateMask & wxLIST_STATE_FOCUSED )
+            {
+                if ( m_qtTreeWidget->currentIndex().row() == id )
+                    info.m_state |= wxLIST_STATE_FOCUSED;
+            }
+            if ( info.m_stateMask & wxLIST_STATE_SELECTED )
+            {
+                if ( qitem->isSelected() )
+                    info.m_state |= wxLIST_STATE_SELECTED;
+            }
+        }
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::SetItem(wxListItem& info)
+{
+    const long id = info.GetId();
+    QTreeWidgetItem *qitem = QtGetItem(id);
+    if ( qitem != NULL )
+    {
+        if ((info.m_mask & wxLIST_MASK_TEXT) && !info.GetText().IsNull() )
+            qitem->setText(info.GetColumn(), wxQtConvertString(info.GetText()));
+        qitem->setTextAlignment(info.GetColumn(), wxQtConvertTextAlign(info.GetAlign()));
+
+        if ( info.m_mask & wxLIST_MASK_DATA )
+        {
+            QVariant variant = qVariantFromValue(info.GetData());
+            qitem->setData(0, Qt::UserRole, variant);
+        }
+        if (info.m_mask & wxLIST_MASK_STATE)
+        {
+            if ((info.m_stateMask & wxLIST_STATE_FOCUSED) &&
+                (info.m_state & wxLIST_STATE_FOCUSED))
+                    m_qtTreeWidget->setCurrentItem(qitem, 0);
+            if (info.m_stateMask & wxLIST_STATE_SELECTED)
+                qitem->setSelected(info.m_state & wxLIST_STATE_SELECTED);
+        }
+        if (info.m_mask & wxLIST_MASK_IMAGE)
+        {
+            if (info.m_image >= 0)
+            {
+                wxImageList *imglst = GetImageList(wxIMAGE_LIST_SMALL);
+                wxCHECK_MSG(imglst, false, "invalid listctrl imagelist");
+                const wxBitmap* bitmap = imglst->GetBitmapPtr(info.m_image);
+                if (bitmap != NULL)
+                {
+                    // set the new image:
+                    qitem->setIcon( info.GetColumn(), QIcon( *bitmap->GetHandle() ));
+                }
+            }
+            else
+            {
+                // remove the image using and empty qt icon:
+                qitem->setIcon( info.GetColumn(), QIcon() );
+            }
+        }
+        for (int col=0; col<GetColumnCount(); col++)
+        {
+            if ( info.GetFont().IsOk() )
+                qitem->setFont(col, info.GetFont().GetHandle() );
+            if ( info.GetTextColour().IsOk() )
+                qitem->setTextColor(col, info.GetTextColour().GetHandle());
+            if ( info.GetBackgroundColour().IsOk() )
+                qitem->setBackgroundColor(col, info.GetBackgroundColour().GetHandle());
+        }
+        return true;
+    }
+    else
+        return false;
+}
+
+long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
+{
+    wxListItem info;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = index;
+    info.m_col = col;
+    if ( imageId > -1 )
+    {
+        info.m_image = imageId;
+        info.m_mask |= wxLIST_MASK_IMAGE;
+    }
+    return SetItem(info);
+}
+
+int  wxListCtrl::GetItemState(long item, long stateMask) const
+{
+    wxListItem info;
+
+    info.m_mask = wxLIST_MASK_STATE;
+    info.m_stateMask = stateMask;
+    info.m_itemId = item;
+
+    if (!GetItem(info))
+        return 0;
+
+    return info.m_state;
+}
+
+bool wxListCtrl::SetItemState(long item, long state, long stateMask)
+{
+    wxListItem info;
+
+    info.m_mask = wxLIST_MASK_STATE;
+    info.m_stateMask = stateMask;
+    info.m_state = state;
+    info.m_itemId = item;
+
+    return SetItem(info);
+}
+
+bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
+{
+    return SetItemColumnImage(item, 0, image);
+}
+
+bool wxListCtrl::SetItemColumnImage(long item, long column, int image)
+{
+    wxListItem info;
+
+    info.m_mask = wxLIST_MASK_IMAGE;
+    info.m_image = image;
+    info.m_itemId = item;
+    info.m_col = column;
+
+    return SetItem(info);
+}
+
+wxString wxListCtrl::GetItemText(long item, int WXUNUSED(col)) const
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem )
+        return wxQtConvertString( qitem->text(0) );
+    else
+        return wxString();
+}
+
+void wxListCtrl::SetItemText(long item, const wxString& str)
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem )
+        qitem->setText( 0, wxQtConvertString( str ) );
+}
+
+wxUIntPtr wxListCtrl::GetItemData(long item) const
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        QVariant variant = qitem->data(0, Qt::UserRole);
+        return variant.value<wxUIntPtr>();
+    }
+    else
+        return 0;
+}
+
+bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        QVariant variant = qVariantFromValue(data);
+        qitem->setData(0, Qt::UserRole, variant);
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::SetItemData(long item, long data)
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        QVariant variant = qVariantFromValue(data);
+        qitem->setData(0, Qt::UserRole, variant);
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::GetItemRect(long item, wxRect& rect, int WXUNUSED(code)) const
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        rect = wxQtConvertRect( m_qtTreeWidget->visualItemRect(qitem) );
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int WXUNUSED(code)) const
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        wxCHECK_MSG( item >= 0 && item < GetItemCount(), NULL,
+                     wxT("invalid row index in GetSubItemRect") );
+        wxCHECK_MSG( subItem >= 0 && subItem < GetColumnCount(), NULL,
+                     wxT("invalid column index in GetSubItemRect") );
+        QModelIndex qindex = m_qtTreeWidget->model()->index(item, subItem);
+        rect = wxQtConvertRect( m_qtTreeWidget->visualRect(qindex) );
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::GetItemPosition(long item, wxPoint& pos) const
+{
+    wxRect rect;
+    GetItemRect(item, rect);
+
+    pos.x = rect.x;
+    pos.y = rect.y;
+
+    return true;
+}
+
+bool wxListCtrl::SetItemPosition(long WXUNUSED(item), const wxPoint& WXUNUSED(pos))
+{
+    return false;
+}
+
+int wxListCtrl::GetItemCount() const
+{
+    return m_qtTreeWidget->topLevelItemCount();
+}
+
+int wxListCtrl::GetColumnCount() const
+{
+    return m_qtTreeWidget->columnCount();
+}
+
+wxSize wxListCtrl::GetItemSpacing() const
+{
+    return wxSize();
+}
+
+void wxListCtrl::SetItemTextColour( long WXUNUSED(item), const wxColour& WXUNUSED(col))
+{
+}
+
+wxColour wxListCtrl::GetItemTextColour( long WXUNUSED(item) ) const
+{
+    return wxColour();
+}
+
+void wxListCtrl::SetItemBackgroundColour( long WXUNUSED(item), const wxColour &WXUNUSED(col))
+{
+}
+
+wxColour wxListCtrl::GetItemBackgroundColour( long WXUNUSED(item) ) const
+{
+    return wxColour();
+}
+
+void wxListCtrl::SetItemFont( long WXUNUSED(item), const wxFont &WXUNUSED(f))
+{
+}
+
+wxFont wxListCtrl::GetItemFont( long WXUNUSED(item) ) const
+{
+    return wxFont();
+}
+
+int wxListCtrl::GetSelectedItemCount() const
+{
+    return m_qtTreeWidget->selectedItems().length();
+}
+
+wxColour wxListCtrl::GetTextColour() const
+{
+    return wxColour();
+}
+
+void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
+{
+}
+
+long wxListCtrl::GetTopItem() const
+{
+    return 0;
+}
+
+void wxListCtrl::SetSingleStyle(long WXUNUSED(style), bool WXUNUSED(add))
+{
+}
+
+void wxListCtrl::SetWindowStyleFlag(long WXUNUSED(style))
+{
+}
+
+long wxListCtrl::GetNextItem(long item, int WXUNUSED(geometry), int state) const
+{
+    wxListItem info;
+    long ret = item,
+         max = GetItemCount();
+    wxCHECK_MSG( (ret == -1) || (ret < max), -1,
+                 wxT("invalid listctrl index in GetNextItem()") );
+
+    // notice that we start with the next item (or the first one if item == -1)
+    // and this is intentional to allow writing a simple loop to iterate over
+    // all selected items
+    ret++;
+    if ( ret == max )
+        // this is not an error because the index was OK initially,
+        // just no such item
+        return -1;
+
+    if ( !state )
+        // any will do
+        return (size_t)ret;
+
+    size_t count = GetItemCount();
+    for ( size_t line = (size_t)ret; line < count; line++ )
+    {
+        if ( GetItemState(line, state) )
+            return line;
+    }
+
+    return -1;
+}
+
+wxImageList *wxListCtrl::GetImageList(int which) const
+{
+    if ( which == wxIMAGE_LIST_NORMAL )
+    {
+        return m_imageListNormal;
+    }
+    else if ( which == wxIMAGE_LIST_SMALL )
+    {
+        return m_imageListSmall;
+    }
+    else if ( which == wxIMAGE_LIST_STATE )
+    {
+        return m_imageListState;
+    }
+    return NULL;
+}
+
+
+void wxListCtrl::SetImageList(wxImageList *imageList, int which)
+{
+    if ( which == wxIMAGE_LIST_NORMAL )
+    {
+        if (m_ownsImageListNormal) delete m_imageListNormal;
+        m_imageListNormal = imageList;
+        m_ownsImageListNormal = false;
+    }
+    else if ( which == wxIMAGE_LIST_SMALL )
+    {
+        if (m_ownsImageListSmall) delete m_imageListSmall;
+        m_imageListSmall = imageList;
+        m_ownsImageListSmall = false;
+    }
+    else if ( which == wxIMAGE_LIST_STATE )
+    {
+        if (m_ownsImageListState) delete m_imageListState;
+        m_imageListState = imageList;
+        m_ownsImageListState = false;
+    }
+}
+
+void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
+{
+    SetImageList(imageList, which);
+    if ( which == wxIMAGE_LIST_NORMAL )
+        m_ownsImageListNormal = true;
+    else if ( which == wxIMAGE_LIST_SMALL )
+        m_ownsImageListSmall = true;
+    else if ( which == wxIMAGE_LIST_STATE )
+        m_ownsImageListState = true;
+}
+
+bool wxListCtrl::InReportView() const
+{
+    return true;
+}
+
+bool wxListCtrl::IsVirtual() const
+{
+    return false;
+}
+
+void wxListCtrl::RefreshItem(long WXUNUSED(item))
+{
+}
+
+void wxListCtrl::RefreshItems(long WXUNUSED(itemFrom), long WXUNUSED(itemTo))
+{
+}
+
+bool wxListCtrl::Arrange(int WXUNUSED(flag))
+{
+    return false;
+}
+
+bool wxListCtrl::DeleteItem(long item)
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        delete qitem;
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::DeleteAllItems()
+{
+    m_qtTreeWidget->clear();
+    return true;
+}
+
+bool wxListCtrl::DeleteColumn(int col)
+{
+    // Qt cannot easily add or remove columns, so only the last one can be deleted
+    if ( col == GetColumnCount() - 1 )
+    {
+        m_qtTreeWidget->setColumnCount(col);
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxListCtrl::DeleteAllColumns()
+{
+    m_qtTreeWidget->setColumnCount(0);
+    return true;
+}
+
+void wxListCtrl::ClearAll()
+{
+    m_qtTreeWidget->clear();
+}
+
+wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* WXUNUSED(textControlClass))
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+        m_qtTreeWidget->openPersistentEditor(qitem);
+    }
+    return NULL;
+}
+
+bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
+{
+    int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
+    if (item > 0)
+    {
+        QTreeWidgetItem *qitem = QtGetItem(item);
+        if ( qitem != NULL )
+        {
+            m_qtTreeWidget->closePersistentEditor(qitem);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool wxListCtrl::EnsureVisible(long item)
+{
+    QTreeWidgetItem *qitem = QtGetItem(item);
+    if ( qitem != NULL )
+    {
+         m_qtTreeWidget->scrollToItem(qitem);
+         return true;
+    }
+    else
+        return false;
+}
+
+long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
+{    
+    int ret;
+    QList <QTreeWidgetItem *> qitems = m_qtTreeWidget->findItems(
+                wxQtConvertString(str),
+                !partial ? Qt::MatchExactly : Qt::MatchContains );
+    for (int i=0; i<qitems.length(); i++)
+    {
+        ret = m_qtTreeWidget->indexOfTopLevelItem(qitems.at(0));
+        if ( ret >= start )
+            return ret;
+    }
+    return -1;
+}
+
+long wxListCtrl::FindItem(long start, wxUIntPtr data)
+{
+    QVariant variant = qVariantFromValue(data);
+    // search only one hit (if any):
+    QModelIndexList qindexes = m_qtTreeWidget->model()->match(
+                 m_qtTreeWidget->model()->index(start, 0),
+                Qt::UserRole, variant, 1 );
+    if (qindexes.isEmpty())
+        return -1;
+    return qindexes.at(0).row();
+}
+
+long wxListCtrl::FindItem(long WXUNUSED(start), const wxPoint& WXUNUSED(pt), int WXUNUSED(direction))
+{
+    return -1;
+}
+
+long wxListCtrl::HitTest(const wxPoint& point, int &flags, long* ptrSubItem) const
+{
+    QModelIndex index = m_qtTreeWidget->indexAt(wxQtConvertPoint(point));
+    if ( index.isValid() )
+    {
+        flags = wxLIST_HITTEST_ONITEM;
+        *ptrSubItem = index.column();
+    }
+    else
+    {
+        flags = wxLIST_HITTEST_NOWHERE;
+        *ptrSubItem = 0;
+    }
+    return index.row();
+}
+
+long wxListCtrl::InsertItem(const wxListItem& info)
+{
+    // default return value if not successful:
+    int index = -1;
+    wxASSERT_MSG( info.m_itemId != -1, wxS("Item ID must be set.") );
+    QTreeWidgetItem *qitem = new QTreeWidgetItem();
+    if ( qitem != NULL )
+    {
+        // insert at the correct index and return it:
+        m_qtTreeWidget->insertTopLevelItem(info.GetId(), qitem);
+        // return the correct position of the item or -1 if not found:
+        index = m_qtTreeWidget->indexOfTopLevelItem(qitem);
+        if ( index != -1 )
+        {
+            // temporarily copy the item info (we need a non-const instance)
+            wxListItem tmp = info;
+            // set the text, image, etc.:
+            SetItem(tmp);
+        }
+    }
+    return index;
+}
+
+long wxListCtrl::InsertItem(long index, const wxString& label)
+{
+    wxListItem info;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = index;
+    return InsertItem(info);
+}
+
+long wxListCtrl::InsertItem(long index, int imageIndex)
+{
+    wxListItem info;
+    info.m_image = imageIndex;
+    info.m_mask = wxLIST_MASK_IMAGE;
+    info.m_itemId = index;
+    return InsertItem(info);
+}
+
+long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
+{
+    wxListItem info;
+    //info.m_image = imageIndex == -1 ? I_IMAGENONE : imageIndex;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
+    info.m_image = imageIndex;
+    info.m_itemId = index;
+    return InsertItem(info);
+}
+
+long wxListCtrl::DoInsertColumn(long col, const wxListItem& info)
+{
+    QTreeWidgetItem *qitem = m_qtTreeWidget->headerItem();
+    if ( qitem != NULL )
+    {
+        qitem->setText(col, wxQtConvertString(info.GetText()));
+        qitem->setTextAlignment(col, wxQtConvertTextAlign(info.GetAlign()));
+        if (info.GetWidth())
+            m_qtTreeWidget->setColumnWidth(col, info.GetWidth());
+        return col;
+    }
+    else
+        return -1;
+}
+
+
+void wxListCtrl::SetItemCount(long WXUNUSED(count))
+{
+}
+
+bool wxListCtrl::ScrollList(int dx, int dy)
+{
+    // aproximate, as scrollContentsBy is protected
+    m_qtTreeWidget->scroll(dx, dy);
+    return true;
+}
+
+bool wxListCtrl::SortItems(wxListCtrlCompare WXUNUSED(fn), wxIntPtr WXUNUSED(data))
+{
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// virtual list controls (not currently implemented in wxQT)
+// ----------------------------------------------------------------------------
+
+wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
+{
+    // this is a pure virtual function, in fact - which is not really pure
+    // because the controls which are not virtual don't need to implement it
+    wxFAIL_MSG( wxT("wxListCtrl::OnGetItemText not supposed to be called") );
+
+    return wxEmptyString;
+}
+
+int wxListCtrl::OnGetItemImage(long WXUNUSED(item)) const
+{
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
+    return -1;
+}
+
+int wxListCtrl::OnGetItemColumnImage(long item, long column) const
+{
+    if (!column)
+        return OnGetItemImage(item);
+
+    return -1;
+}
+
+QTreeWidget *wxListCtrl::GetHandle() const
+{
+    return m_qtTreeWidget;
+}
diff --git a/src/qt/mdi.cpp b/src/qt/mdi.cpp
new file mode 100644
index 0000000000..770224d955
--- /dev/null
+++ b/src/qt/mdi.cpp
@@ -0,0 +1,153 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/mdi.cpp
+// Author:      Mariano Reingart, Peter Most
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_MDI
+
+#include "wx/mdi.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QMdiArea>
+
+// Main MDI window helper
+
+class wxQtMDIParentFrame : public wxQtEventSignalHandler< QMainWindow, wxMDIParentFrame >
+{
+public:
+    wxQtMDIParentFrame( wxWindow *parent, wxMDIParentFrame *handler );
+
+private:
+};
+
+// Central widget helper (container to show scroll bars and receive events):
+
+class wxQtMdiArea : public wxQtEventSignalHandler< QMdiArea, wxMDIClientWindow >
+{
+    public:
+        wxQtMdiArea( wxWindow *parent, wxMDIClientWindow *handler );
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
+
+wxMDIParentFrame::wxMDIParentFrame()
+{
+}
+
+wxMDIParentFrame::wxMDIParentFrame(wxWindow *parent,
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 long style,
+                 const wxString& name)
+{
+    (void)Create(parent, id, title, pos, size, style, name);
+}
+
+bool wxMDIParentFrame::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    m_qtWindow = new wxQtMDIParentFrame( parent, this );
+
+    if (!wxFrameBase::Create( parent, id, title, pos, size, style, name ))
+        return false;
+
+    wxMDIClientWindow *client = OnCreateClient();
+    m_clientWindow = client;
+    if ( !m_clientWindow->CreateClient(this, GetWindowStyleFlag()) )
+        return false;
+
+    GetHandle()->setCentralWidget( client->GetHandle() );
+
+    PostCreation();
+
+    return true;
+}
+
+void wxMDIParentFrame::ActivateNext()
+{
+}
+
+void wxMDIParentFrame::ActivatePrevious()
+{
+}
+
+//##############################################################################
+
+wxMDIChildFrame::wxMDIChildFrame()
+{
+}
+
+wxMDIChildFrame::wxMDIChildFrame(wxMDIParentFrame *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxString& name)
+{
+    Create(parent, id, title, pos, size, style, name);
+}
+
+bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    m_mdiParent = parent;
+    bool ok = wxFrame::Create(parent->GetClientWindow(), id,
+                              title,
+                               pos, size, style, name);
+    if (ok)
+    {
+        // Add the window to the internal MDI client area:
+        static_cast<QMdiArea*>(parent->GetHandle()->centralWidget())->addSubWindow(GetHandle());
+    }
+    return ok;
+}
+
+void wxMDIChildFrame::Activate()
+{
+}
+
+//##############################################################################
+
+wxMDIClientWindow::wxMDIClientWindow()
+{
+}
+
+bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long WXUNUSED(style))
+{
+    // create the MDI client area where the children window are displayed:
+    m_qtWindow = new wxQtMdiArea( parent, this );
+    return true;
+}
+
+// Helper implementation:
+
+wxQtMDIParentFrame::wxQtMDIParentFrame( wxWindow *parent, wxMDIParentFrame *handler )
+    : wxQtEventSignalHandler< QMainWindow, wxMDIParentFrame >( parent, handler )
+{
+}
+
+wxQtMdiArea::wxQtMdiArea(wxWindow *parent, wxMDIClientWindow *handler )
+    : wxQtEventSignalHandler< QMdiArea, wxMDIClientWindow >( parent, handler )
+{
+}
+
+#endif // wxUSE_MDI
diff --git a/src/qt/mediactrl.cpp b/src/qt/mediactrl.cpp
new file mode 100644
index 0000000000..ce1cdda199
--- /dev/null
+++ b/src/qt/mediactrl.cpp
@@ -0,0 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/mediactrl.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_MEDIACTRL
+
+#include "wx/mediactrl.h"
+
+// Force link into main library so this backend can be loaded
+#include "wx/html/forcelnk.h"
+FORCE_LINK_ME(basewxmediabackends)
+
+#endif //wxUSE_MEDIACTRL
diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp
new file mode 100644
index 0000000000..1aaabf6d23
--- /dev/null
+++ b/src/qt/menu.cpp
@@ -0,0 +1,251 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/menu.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/menu.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+
+
+static void ApplyStyle( QMenu *qtMenu, long style )
+{
+    if ( style & wxMENU_TEAROFF )
+        qtMenu->setTearOffEnabled( true );
+}
+
+wxMenu::wxMenu(long style)
+    : wxMenuBase( style )
+{
+    m_qtMenu = new QMenu();
+
+    ApplyStyle( m_qtMenu, style );
+}
+
+wxMenu::wxMenu(const wxString& title, long style)
+    : wxMenuBase( title, style )
+{
+    m_qtMenu = new QMenu( wxQtConvertString( title ));
+
+    ApplyStyle( m_qtMenu, style );
+}
+
+
+
+static wxMenuItem *GetMenuItemAt( const wxMenu *menu, size_t position )
+{
+    // FindItemByPosition() is doing the same test, but we want to prevent
+    // the warning message it prints when an illegal index is used.
+
+    if ( position < menu->GetMenuItemCount() )
+        return menu->FindItemByPosition( position );
+    else
+        return NULL;
+}
+
+
+static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previousItem,
+    const wxMenuItem *item, const wxMenuItem *successiveItem )
+{
+    QMenu *qtMenu = menu->GetHandle();
+    QAction *itemAction = item->GetHandle();
+    if ( item->GetKind() == wxITEM_RADIO )
+    {
+        // If the previous menu item is a radio item then add this item to the
+        // same action group, otherwise start a new group:
+
+        if ( previousItem != NULL && previousItem->GetKind() == wxITEM_RADIO )
+        {
+            QAction *previousItemAction = previousItem->GetHandle();
+            QActionGroup *previousItemActionGroup = previousItemAction->actionGroup();
+            wxASSERT_MSG( previousItemActionGroup != NULL, "An action group should have been setup" );
+            previousItemActionGroup->addAction( itemAction );
+        }
+        else
+        {
+            QActionGroup *actionGroup = new QActionGroup( qtMenu );
+            actionGroup->addAction( itemAction );
+            wxASSERT_MSG( itemAction->actionGroup() == actionGroup, "Must be the same action group" );
+        }
+    }
+    // Insert the action into the actual menu:
+    QAction *successiveItemAction = ( successiveItem != NULL ) ? successiveItem->GetHandle() : NULL;
+    qtMenu->insertAction( successiveItemAction, itemAction );
+}
+
+wxMenuItem *wxMenu::DoAppend(wxMenuItem *item)
+{
+    // Get the previous/successive items *before* we call the base class methods,
+    // because afterwards it is less clear where these items end up:
+
+    wxMenuItem *previousItem = GetMenuItemAt( this, GetMenuItemCount() - 1 );
+    wxMenuItem *successiveItem = GetMenuItemAt( this, GetMenuItemCount() );
+
+    if ( wxMenuBase::DoAppend( item ) == NULL )
+        return NULL;
+
+    InsertMenuItemAction( this, previousItem, item, successiveItem );
+
+    return item;
+}
+
+
+wxMenuItem *wxMenu::DoInsert(size_t insertPosition, wxMenuItem *item)
+{
+    // Get the previous/successive items *before* we call the base class methods,
+    // because afterwards it is less clear where these items end up:
+
+    wxMenuItem *previousItem = GetMenuItemAt( this, insertPosition - 1 );
+    wxMenuItem *successiveItem = GetMenuItemAt( this, insertPosition );
+
+    if ( wxMenuBase::DoInsert( insertPosition, item ) == NULL )
+        return NULL;
+
+    InsertMenuItemAction( this, previousItem, item, successiveItem );
+
+    return item;
+}
+
+
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
+{
+    if ( wxMenuBase::DoRemove( item ) == NULL )
+        return NULL;
+
+    m_qtMenu->removeAction( item->GetHandle() );
+
+    return item;
+}
+
+
+QMenu *wxMenu::GetHandle() const
+{
+    return m_qtMenu;
+}
+
+
+//##############################################################################
+
+wxMenuBar::wxMenuBar()
+{
+    m_qtMenuBar  = new QMenuBar();
+    PostCreation();
+}
+
+wxMenuBar::wxMenuBar( long WXUNUSED( style ))
+{
+    m_qtMenuBar = new QMenuBar();
+    PostCreation();
+}
+
+wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED( style ))
+{
+    m_qtMenuBar = new QMenuBar();
+
+    for ( size_t i = 0; i < count; ++i )
+        Append( menus[ i ], titles[ i ] );
+
+    PostCreation();
+}
+
+
+static QMenu *SetTitle( wxMenu *menu, const wxString &title )
+{
+    QMenu *qtMenu = menu->GetHandle();
+    qtMenu->setTitle( wxQtConvertString( title ));
+
+    return qtMenu;
+}
+
+
+bool wxMenuBar::Append( wxMenu *menu, const wxString& title )
+{
+    if ( !wxMenuBarBase::Append( menu, title ))
+        return false;
+
+    // Override the stored menu title with the given one:
+
+    QMenu *qtMenu = SetTitle( menu, title );
+    m_qtMenuBar->addMenu( qtMenu );
+    
+    return true;
+}
+
+
+static QAction *GetActionAt( const QWidget *qtWidget, size_t pos )
+{
+    QList< QAction * > actions = qtWidget->actions();
+    return pos < static_cast< unsigned >( actions.size() ) ? actions.at( pos ) : NULL;
+}
+
+
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+{
+    if ( !wxMenuBarBase::Insert( pos, menu, title ))
+        return false;
+
+    // Override the stored menu title with the given one:
+
+    QMenu *qtMenu = SetTitle( menu, title );
+    QAction *qtAction = GetActionAt( m_qtMenuBar, pos );
+    m_qtMenuBar->insertMenu( qtAction, qtMenu );
+
+    return true;
+}
+
+wxMenu *wxMenuBar::Remove(size_t pos)
+{
+    wxMenu *menu;
+
+    if (( menu = wxMenuBarBase::Remove( pos )) == NULL )
+        return NULL;
+
+    m_qtMenuBar->removeAction( GetActionAt( m_qtMenuBar, pos ));
+    return menu;
+}
+
+void wxMenuBar::EnableTop(size_t pos, bool enable)
+{
+    QAction *qtAction = GetActionAt( m_qtMenuBar, pos );
+    qtAction->setEnabled( enable );
+}
+
+
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
+{
+    QAction *qtAction = GetActionAt( m_qtMenuBar, pos );
+    QMenu *qtMenu = qtAction->menu();
+    qtMenu->setTitle( wxQtConvertString( label ));
+}
+
+wxString wxMenuBar::GetMenuLabel(size_t pos) const
+{
+    QAction *qtAction = GetActionAt( m_qtMenuBar, pos );
+    QMenu *qtMenu = qtAction->menu();
+
+    return wxQtConvertString( qtMenu->title() );
+}
+
+void wxMenuBar::Attach(wxFrame *frame)
+{
+    // sanity check as setMenuBar takes ownership
+    wxCHECK_RET( m_qtMenuBar, "Menu bar has been previously deleted by Qt");
+    wxMenuBarBase::Attach(frame);
+}
+
+void wxMenuBar::Detach()
+{
+    // the QMenuBar probably was deleted by Qt as setMenuBar takes ownership
+    m_qtMenuBar = NULL;
+    wxMenuBarBase::Detach();
+}
+
+QMenuBar *wxMenuBar::GetHandle() const
+{
+    return m_qtMenuBar;
+}
diff --git a/src/qt/menuitem.cpp b/src/qt/menuitem.cpp
new file mode 100644
index 0000000000..5d7bac2ec2
--- /dev/null
+++ b/src/qt/menuitem.cpp
@@ -0,0 +1,168 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/menuitem.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/menuitem.h"
+#include "wx/menu.h"
+#include "wx/bitmap.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtAction : public QAction, public wxQtSignalHandler< wxMenuItem >
+{
+
+public:
+    wxQtAction( wxMenu *parent, int id, const wxString &text, const wxString &help,
+        wxItemKind kind, wxMenu *subMenu, wxMenuItem *handler );
+
+private:
+    void onActionTriggered( bool checked );
+};
+
+
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, int id, const wxString& name,
+    const wxString& help, wxItemKind kind, wxMenu *subMenu)
+{
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
+}
+
+
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu, int id, const wxString& text,
+        const wxString& help, wxItemKind kind, wxMenu *subMenu)
+    : wxMenuItemBase( parentMenu, id, text, help, kind, subMenu )
+{
+    m_qtAction = new wxQtAction( parentMenu, id, text, help, kind, subMenu, this );
+}
+
+
+
+void wxMenuItem::SetItemLabel( const wxString &label )
+{
+    wxMenuItemBase::SetItemLabel( label );
+
+    m_qtAction->setText( wxQtConvertString( label ));
+}
+
+
+
+void wxMenuItem::SetCheckable( bool checkable )
+{
+    wxMenuItemBase::SetCheckable( checkable );
+
+    m_qtAction->setCheckable( checkable );
+}
+
+
+
+void wxMenuItem::Enable( bool enable )
+{
+    wxMenuItemBase::Enable( enable );
+
+    m_qtAction->setEnabled( enable );
+}
+
+
+
+bool wxMenuItem::IsEnabled() const
+{
+    bool isEnabled = m_qtAction->isEnabled();
+
+    // Make sure the enabled stati are in synch:
+    wxASSERT( isEnabled == wxMenuItemBase::IsEnabled() );
+
+    return isEnabled;
+}
+
+
+
+void wxMenuItem::Check( bool checked )
+{
+    wxMenuItemBase::Check( checked );
+
+    m_qtAction->setChecked( checked );
+}
+
+
+
+bool wxMenuItem::IsChecked() const
+{
+    bool isChecked = m_qtAction->isChecked();
+
+    // Make sure the checked stati are in synch:
+    wxASSERT( isChecked == wxMenuItemBase::IsChecked() );
+
+    return isChecked;
+}
+
+
+void wxMenuItem::SetBitmap(const wxBitmap& WXUNUSED(bitmap))
+{
+    wxMISSING_FUNCTION();
+}
+
+const wxBitmap &wxMenuItem::GetBitmap() const
+{
+    wxMISSING_FUNCTION();
+
+    static wxBitmap s_bitmap;
+
+    return s_bitmap;
+}
+
+QAction *wxMenuItem::GetHandle() const
+{
+    return m_qtAction;
+}
+
+//=============================================================================
+
+wxQtAction::wxQtAction( wxMenu *parent, int id, const wxString &text, const wxString &help,
+        wxItemKind kind, wxMenu *subMenu, wxMenuItem *handler )
+    : QAction( wxQtConvertString( text ), parent->GetHandle() ),
+      wxQtSignalHandler< wxMenuItem >( handler )
+{
+    setStatusTip( wxQtConvertString( help ));
+
+    if ( subMenu != NULL )
+        setMenu( subMenu->GetHandle() );
+
+    if ( id == wxID_SEPARATOR )
+        setSeparator( true );
+
+    switch ( kind )
+    {
+        case wxITEM_SEPARATOR:
+            setSeparator( true );
+            break;
+        case wxITEM_CHECK:
+        case wxITEM_RADIO:
+            setCheckable( true );
+            break;
+        case wxITEM_NORMAL:
+            // Normal for a menu item.
+            break;
+        case wxITEM_DROPDOWN:
+        case wxITEM_MAX:
+            // Not applicable for menu items.
+            break;
+    }
+
+    connect( this, &QAction::triggered, this, &wxQtAction::onActionTriggered );
+}
+ 
+
+void wxQtAction::onActionTriggered( bool checked )
+{
+    wxMenuItem *handler = GetHandler();
+    wxMenu *menu = handler->GetMenu();
+    menu->SendEvent( handler->GetId(), handler->IsCheckable() ? checked : -1 );
+}
diff --git a/src/qt/minifram.cpp b/src/qt/minifram.cpp
new file mode 100644
index 0000000000..70a987912a
--- /dev/null
+++ b/src/qt/minifram.cpp
@@ -0,0 +1,22 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/minifram.cpp
+// Purpose:     wxMiniFrame
+// Author:      Mariano Reingart
+// Copyright:   (c) 2014 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#if wxUSE_MINIFRAME
+
+#include "wx/minifram.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+
+#endif // wxUSE_MINIFRAME
diff --git a/src/qt/msgdlg.cpp b/src/qt/msgdlg.cpp
new file mode 100644
index 0000000000..cb27e80749
--- /dev/null
+++ b/src/qt/msgdlg.cpp
@@ -0,0 +1,149 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/msgdlg.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/msgdlg.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/winevent.h"
+
+#include <QtWidgets/qmessagebox.h>
+
+
+class wxQtMessageDialog : public wxQtEventSignalHandler< QMessageBox, wxMessageDialog >
+{
+    
+    public:
+        wxQtMessageDialog( wxWindow *parent, wxMessageDialog *handler );
+};
+
+
+wxMessageDialog::wxMessageDialog( wxWindow *parent, const wxString& message,
+        const wxString& caption, long style, const wxPoint& pos )
+    : wxMessageDialogBase( parent, message, caption, style )
+{
+    m_qtMessageBox = new wxQtMessageDialog( parent, this );
+
+    // Set properties
+    Move( pos );
+    m_qtMessageBox->setText( wxQtConvertString( message ) );
+    m_qtMessageBox->setWindowTitle( wxQtConvertString( caption ) );
+    
+    // Apply the style
+    SetWindowStyleFlag( style );
+
+    // Buttons
+    if ( style & wxOK )
+        m_qtMessageBox->addButton( QMessageBox::Ok );
+    if ( style & wxCANCEL )
+        m_qtMessageBox->addButton( QMessageBox::Cancel );
+    if ( style & wxYES_NO )
+    {
+        m_qtMessageBox->addButton( QMessageBox::Yes );
+        m_qtMessageBox->addButton( QMessageBox::No );
+    }
+
+    // Default button
+    if ( style & wxNO_DEFAULT )
+        m_qtMessageBox->setDefaultButton( QMessageBox::No );
+    else if ( style & wxCANCEL_DEFAULT )
+        m_qtMessageBox->setDefaultButton( QMessageBox::Cancel );
+    else
+    {
+        // Default to OK or Yes
+        if ( style & wxOK )
+            m_qtMessageBox->setDefaultButton( QMessageBox::Ok );
+        else
+            m_qtMessageBox->setDefaultButton( QMessageBox::Yes );
+    }
+
+    // Icon
+    int numIcons = 0;
+    if ( style & wxICON_NONE )
+    {
+        numIcons++;
+        m_qtMessageBox->setIcon( QMessageBox::NoIcon );
+    }
+
+    if ( style & wxICON_EXCLAMATION )
+    {
+        numIcons++;
+        m_qtMessageBox->setIcon( QMessageBox::Warning );
+    }
+
+    if ( style & wxICON_ERROR || style & wxICON_HAND )
+    {
+        numIcons++;
+        m_qtMessageBox->setIcon( QMessageBox::Critical );
+    }
+
+    if ( style & wxICON_QUESTION )
+    {
+        numIcons++;
+        m_qtMessageBox->setIcon( QMessageBox::Question );
+    }
+        
+    if ( style & wxICON_INFORMATION )
+    {
+        numIcons++;
+        m_qtMessageBox->setIcon( QMessageBox::Information );
+    }
+
+    wxCHECK_RET( numIcons <= 1, "Multiple icon definitions" );
+    if ( numIcons == 0 )
+    {
+        // Use default
+        if ( style & wxYES_NO )
+            m_qtMessageBox->setIcon( QMessageBox::Question );
+        else
+            m_qtMessageBox->setIcon( QMessageBox::Information );
+    }
+
+    if ( style & wxSTAY_ON_TOP )
+        m_qtMessageBox->setWindowModality( Qt::ApplicationModal );
+
+    PostCreation();
+}
+
+int wxMessageDialog::ShowModal()
+{
+    wxCHECK_MSG( m_qtMessageBox, -1, "Invalid dialog" );
+    
+    // Exec may return a wx identifier if a close event is generated
+    int ret = GetHandle()->exec();
+    switch ( ret )
+    {
+        case QMessageBox::Ok:
+            return wxID_OK;
+        case QMessageBox::Cancel:
+            return wxID_CANCEL;
+        case QMessageBox::Yes:
+            return wxID_YES;
+        case QMessageBox::No:
+            return wxID_NO;
+        default:
+            //wxFAIL_MSG( "unexpected QMessageBox return code" );
+            return ret;
+    }                                        
+}
+
+QMessageBox *wxMessageDialog::GetHandle() const
+{
+    return m_qtMessageBox;
+}
+
+wxMessageDialog::~wxMessageDialog()
+{
+}
+
+//=============================================================================
+
+wxQtMessageDialog::wxQtMessageDialog( wxWindow *parent, wxMessageDialog *handler )
+    : wxQtEventSignalHandler< QMessageBox, wxMessageDialog >( parent, handler )
+{
+}
diff --git a/src/qt/notebook.cpp b/src/qt/notebook.cpp
new file mode 100644
index 0000000000..2a971f5b95
--- /dev/null
+++ b/src/qt/notebook.cpp
@@ -0,0 +1,205 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/notebook.cpp
+// Author:      Mariano Reingart, Peter Most
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/notebook.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+class wxQtTabWidget : public wxQtEventSignalHandler< QTabWidget, wxNotebook >
+{
+public:
+    wxQtTabWidget( wxWindow *parent, wxNotebook *handler );
+    void currentChanged(int index);
+};
+
+wxQtTabWidget::wxQtTabWidget( wxWindow *parent, wxNotebook *handler )
+    : wxQtEventSignalHandler< QTabWidget, wxNotebook >( parent, handler )
+{
+    connect(this, &QTabWidget::currentChanged, this, &wxQtTabWidget::currentChanged);
+}
+
+void wxQtTabWidget::currentChanged(int index)
+{
+    wxNotebook *handler = GetHandler();
+    if ( handler )
+    {
+        int old = handler->GetSelection();
+        // revert change be able to simulate veto (select back the old tab):
+        if (old >= 0)
+        {
+            handler->ChangeSelection(old);
+        }
+        // send the wx event and check if accepted (and then show the new tab):
+        if (handler->SendPageChangingEvent(index))
+        {
+            // not vetoed, send the event and store new index
+            handler->ChangeSelection(index);
+            handler->SendPageChangedEvent(old, index);
+        }
+    }
+}
+
+
+wxNotebook::wxNotebook()
+{
+}
+
+wxNotebook::wxNotebook(wxWindow *parent,
+         wxWindowID id,
+         const wxPoint& pos,
+         const wxSize& size,
+         long style,
+         const wxString& name)
+{
+    Create( parent, id, pos, size, style, name );
+}
+
+bool wxNotebook::Create(wxWindow *parent,
+          wxWindowID id,
+          const wxPoint& pos,
+          const wxSize& size,
+          long style,
+          const wxString& name)
+{
+    m_qtTabWidget = new wxQtTabWidget( parent, this );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding))
+{
+}
+
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
+{
+}
+
+
+bool wxNotebook::SetPageText(size_t n, const wxString &text)
+{
+    m_qtTabWidget->setTabText( n, wxQtConvertString( text ));
+
+    return true;
+}
+
+wxString wxNotebook::GetPageText(size_t n) const
+{
+    return wxQtConvertString( m_qtTabWidget->tabText( n ));
+}
+
+int wxNotebook::GetPageImage(size_t n) const
+{
+    wxCHECK_MSG(n < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
+
+    return m_images[n];
+
+}
+
+bool wxNotebook::SetPageImage(size_t n, int imageId)
+{
+    wxCHECK_MSG(n < GetPageCount(), false, "invalid notebook index");
+
+    if (imageId >= 0)
+    {
+        wxCHECK_MSG(HasImageList(), false, "invalid notebook imagelist");
+        const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(imageId);
+        if (bitmap == NULL)
+            return false;
+        // set the new image:
+        m_qtTabWidget->setTabIcon( n, QIcon( *bitmap->GetHandle() ));
+    }
+    else
+    {
+        // remove the image using and empty qt icon:
+        m_qtTabWidget->setTabIcon( n, QIcon() );
+    }
+    m_images[n] = imageId;
+    return true;
+}
+
+bool wxNotebook::InsertPage(size_t n, wxWindow *page, const wxString& text,
+    bool bSelect, int imageId)
+{
+    // disable firing qt signals until wx structures are filled
+    m_qtTabWidget->blockSignals(true);
+
+    if (imageId != -1)
+    {
+        if (HasImageList())
+        {
+            const wxBitmap* bitmap = GetImageList()->GetBitmapPtr(imageId);
+            m_qtTabWidget->insertTab( n, page->GetHandle(), QIcon( *bitmap->GetHandle() ), wxQtConvertString( text ));
+        }
+        else
+        {
+            wxFAIL_MSG("invalid notebook imagelist");
+        }
+    }
+    else
+    {
+        m_qtTabWidget->insertTab( n, page->GetHandle(), wxQtConvertString( text ));
+    }
+
+    m_pages.Insert(page, n);
+    m_images.insert(m_images.begin() + n, imageId);
+
+    // reenable firing qt signals as internal wx initialization was completed
+    m_qtTabWidget->blockSignals(false);
+
+    if (bSelect && GetPageCount() > 1)
+    {
+        SetSelection( n );
+    }
+
+    return true;
+}
+
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    return sizePage;
+}
+
+int wxNotebook::DoSetSelection(size_t page, int flags)
+{
+    wxCHECK_MSG(page < GetPageCount(), wxNOT_FOUND, "invalid notebook index");
+
+    int selOld = GetSelection();
+
+    // do not fire signals for certain methods (i.e. ChangeSelection
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        m_qtTabWidget->blockSignals(true);
+    }
+    // change the QTabWidget selected page:
+    m_selection = page;
+    m_qtTabWidget->setCurrentIndex( page );
+    if ( !(flags & SetSelection_SendEvent) )
+    {
+        m_qtTabWidget->blockSignals(false);
+    }
+    return selOld;
+}
+
+
+wxWindow *wxNotebook::DoRemovePage(size_t page)
+{
+    QWidget *qtWidget = m_qtTabWidget->widget( page );
+    m_qtTabWidget->removeTab( page );
+    wxNotebookBase::DoRemovePage(page);
+    m_images.erase( m_images.begin() + page );
+
+    return QtRetrieveWindowPointer( qtWidget );
+}
+
+QTabWidget *wxNotebook::GetHandle() const
+{
+    return m_qtTabWidget;
+}
diff --git a/src/qt/palette.cpp b/src/qt/palette.cpp
new file mode 100644
index 0000000000..933a99943b
--- /dev/null
+++ b/src/qt/palette.cpp
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/palette.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/palette.h"
+
+wxPalette::wxPalette()
+{
+}
+
+wxPalette::wxPalette(int WXUNUSED(n), unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue))
+{
+}
+
+bool wxPalette::Create(int WXUNUSED(n), unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue))
+{
+    return false;
+}
+
+bool wxPalette::GetRGB(int WXUNUSED(pixel), unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue)) const
+{
+    return false;
+}
+
+int wxPalette::GetPixel(unsigned char WXUNUSED(red), unsigned char WXUNUSED(green), unsigned char WXUNUSED(blue)) const
+{
+    return false;
+}
+
+
+wxGDIRefData *wxPalette::CreateGDIRefData() const
+{
+    return NULL;
+}
+
+wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
+{
+    return NULL;
+}
+
diff --git a/src/qt/pen.cpp b/src/qt/pen.cpp
new file mode 100644
index 0000000000..e0313b6d1a
--- /dev/null
+++ b/src/qt/pen.cpp
@@ -0,0 +1,379 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/pen.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/pen.h"
+#include "wx/colour.h"
+#include "wx/qt/private/utils.h"
+#include <QtGui/QPen>
+
+static Qt::PenStyle ConvertPenStyle(wxPenStyle style)
+{
+    switch(style)
+    {
+        case wxPENSTYLE_SOLID:
+            return Qt::SolidLine;
+
+        case wxPENSTYLE_TRANSPARENT:
+            return Qt::NoPen;
+
+        case wxPENSTYLE_DOT:
+            return Qt::DotLine;
+
+        case wxPENSTYLE_LONG_DASH:
+        case wxPENSTYLE_SHORT_DASH:
+            return Qt::DashLine;
+
+        case wxPENSTYLE_DOT_DASH:
+            return Qt::DotLine;
+
+        case wxPENSTYLE_USER_DASH:
+            return Qt::CustomDashLine;
+        
+        case wxPENSTYLE_STIPPLE:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_STIPPLE" );
+            break;
+
+        case wxPENSTYLE_BDIAGONAL_HATCH:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_BDIAGONAL_HATCH" );
+            break;
+
+        case wxPENSTYLE_CROSSDIAG_HATCH:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_CROSSDIAG_HATCH" );
+            break;
+
+        case wxPENSTYLE_FDIAGONAL_HATCH:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_FDIAGONAL_HATCH" );
+            break;
+
+        case wxPENSTYLE_CROSS_HATCH:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_CROSS_HATCH" );
+            break;
+
+        case wxPENSTYLE_HORIZONTAL_HATCH:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_HORIZONTAL_HATCH" );
+            break;
+
+        case wxPENSTYLE_VERTICAL_HATCH:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_VERTICAL_HATCH" );
+            break;
+
+        case wxPENSTYLE_STIPPLE_MASK:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_STIPPLE_MASK" );
+            break;
+
+        case wxPENSTYLE_STIPPLE_MASK_OPAQUE:
+            wxMISSING_IMPLEMENTATION( "wxPENSTYLE_STIPPLE_MASK_OPAQUE" );
+            break;
+
+        case wxPENSTYLE_INVALID:
+            wxFAIL_MSG( "Invalid pen style value" );
+            break;
+    }
+    return Qt::SolidLine;
+}
+
+static wxPenStyle ConvertPenStyle(Qt::PenStyle style)
+{
+    switch (style)
+    {
+        case Qt::SolidLine:
+            return wxPENSTYLE_SOLID;
+
+        case Qt::NoPen:
+            return wxPENSTYLE_TRANSPARENT;
+
+        case Qt::DotLine:
+            return wxPENSTYLE_DOT;
+
+        case Qt::DashLine:
+            return wxPENSTYLE_SHORT_DASH;
+
+        case Qt::DashDotLine:
+            return wxPENSTYLE_DOT_DASH;
+
+        case Qt::DashDotDotLine:
+            wxMISSING_IMPLEMENTATION( "Qt::DashDotDotLine" );
+            return wxPENSTYLE_DOT_DASH;
+
+        case Qt::CustomDashLine:
+            return wxPENSTYLE_USER_DASH;
+
+        case Qt::MPenStyle:
+            wxMISSING_IMPLEMENTATION( "Qt::MPenStyle" );
+            break;
+    }
+    return wxPENSTYLE_SOLID;
+}
+
+static Qt::PenCapStyle ConvertPenCapStyle(wxPenCap style)
+{
+    switch (style)
+    {
+        case wxCAP_BUTT:
+            return Qt::FlatCap;
+
+        case wxCAP_PROJECTING:
+            return Qt::SquareCap;
+
+        case wxCAP_ROUND:
+            return Qt::RoundCap;
+
+        case wxCAP_INVALID:
+            wxFAIL_MSG( "Invalid pen cap value" );
+            break;
+    }
+    return Qt::SquareCap;
+}
+
+static wxPenCap ConvertPenCapStyle(Qt::PenCapStyle style)
+{
+    switch (style)
+    {
+        case Qt::FlatCap:
+            return wxCAP_BUTT;
+
+        case Qt::SquareCap:
+            return wxCAP_PROJECTING;
+
+        case Qt::RoundCap:
+            return wxCAP_ROUND;
+
+        case Qt::MPenCapStyle:
+            wxMISSING_IMPLEMENTATION( "Qt::MPenCapStyle" );
+            break;
+    }
+    return wxCAP_PROJECTING;
+}
+
+static Qt::PenJoinStyle ConvertPenJoinStyle(wxPenJoin style)
+{
+    switch (style)
+    {
+        case wxJOIN_BEVEL:
+            return Qt::BevelJoin;
+
+        case wxJOIN_MITER:
+            return Qt::MiterJoin;
+
+        case wxJOIN_ROUND:
+            return Qt::RoundJoin;
+
+        case wxJOIN_INVALID:
+            wxFAIL_MSG( "Invalid pen join value" );
+            break;
+    }
+    return Qt::BevelJoin;
+}
+
+static wxPenJoin ConvertPenJoinStyle(Qt::PenJoinStyle style)
+{
+    switch (style)
+    {
+        case Qt::BevelJoin:
+            return wxJOIN_BEVEL;
+
+        case Qt::MiterJoin:
+            return wxJOIN_MITER;
+
+        case Qt::RoundJoin:
+            return wxJOIN_ROUND;
+
+        case Qt::SvgMiterJoin:
+            wxMISSING_IMPLEMENTATION( "Qt::SvgMiterJoin" );
+            return wxJOIN_MITER;
+
+        case Qt::MPenJoinStyle:
+            wxMISSING_IMPLEMENTATION( "Qt::MPenJoinStyle" );
+            break;
+    }
+    return wxJOIN_BEVEL;
+}
+
+//-----------------------------------------------------------------------------
+// wxPen
+//-----------------------------------------------------------------------------
+
+class wxPenRefData: public wxGDIRefData
+{
+    public:
+        void defaultPen()
+        {
+            m_qtPen.setCapStyle(Qt::RoundCap);
+            m_qtPen.setJoinStyle(Qt::RoundJoin);
+        }
+        
+        wxPenRefData()
+        {
+            defaultPen();
+        }
+        
+        wxPenRefData( const wxPenRefData& data )
+        : wxGDIRefData()
+        {
+            m_qtPen = data.m_qtPen;
+            defaultPen();
+        }
+        
+        bool operator == (const wxPenRefData& data) const
+        {
+             return m_qtPen == data.m_qtPen;
+        }
+        
+        QPen m_qtPen;
+        const wxDash *m_dashes;
+        int m_dashesSize;
+};
+
+//-----------------------------------------------------------------------------
+
+#define M_PENDATA ((wxPenRefData *)m_refData)->m_qtPen
+
+wxPen::wxPen()
+{
+    m_refData = new wxPenRefData();
+}
+
+wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style)
+{
+    m_refData = new wxPenRefData();
+    M_PENDATA.setWidth(width);
+    M_PENDATA.setStyle(ConvertPenStyle(style));
+    M_PENDATA.setColor(colour.GetHandle());
+}
+
+wxPen::wxPen(const wxColour& col, int width, int style)
+{
+    m_refData = new wxPenRefData();
+    M_PENDATA.setWidth(width);
+    M_PENDATA.setStyle(ConvertPenStyle((wxPenStyle)style));
+    M_PENDATA.setColor(col.GetHandle());
+}
+
+
+bool wxPen::operator==(const wxPen& pen) const
+{
+    if (m_refData == pen.m_refData) return true;
+    
+    if (!m_refData || !pen.m_refData) return false;
+    
+    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
+}
+
+bool wxPen::operator!=(const wxPen& pen) const
+{
+    return !(*this == pen);
+}
+
+void wxPen::SetColour(const wxColour& col)
+{
+    AllocExclusive();
+    M_PENDATA.setColor(col.GetHandle());
+}
+
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
+{
+    AllocExclusive();
+    M_PENDATA.setColor(QColor(r, g, b));
+}
+
+void wxPen::SetWidth(int width)
+{
+    AllocExclusive();
+    M_PENDATA.setWidth(width);
+}
+
+void wxPen::SetStyle(wxPenStyle style)
+{
+    AllocExclusive();
+    M_PENDATA.setStyle(ConvertPenStyle(style));
+}
+
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
+{
+    wxFAIL_MSG( "stippled pens not supported" );
+}
+
+void wxPen::SetDashes(int nb_dashes, const wxDash *dash)
+{
+    AllocExclusive();
+    ((wxPenRefData *)m_refData)->m_dashes = dash;
+    ((wxPenRefData *)m_refData)->m_dashesSize = nb_dashes;
+    
+    QVector<qreal> dashes;
+    for (int i = 0; i < nb_dashes; i++) {
+        dashes << dash[i];
+    }
+    
+    M_PENDATA.setDashPattern(dashes);
+}
+
+void wxPen::SetJoin(wxPenJoin join)
+{
+    AllocExclusive();
+    M_PENDATA.setJoinStyle(ConvertPenJoinStyle(join));
+}
+
+void wxPen::SetCap(wxPenCap cap)
+{
+    AllocExclusive();
+    M_PENDATA.setCapStyle(ConvertPenCapStyle(cap));
+}
+
+wxColour wxPen::GetColour() const
+{
+    wxColour c(M_PENDATA.color());
+    return c;
+}
+
+wxBitmap *wxPen::GetStipple() const
+{
+    return NULL;
+}
+
+wxPenStyle wxPen::GetStyle() const
+{
+    return ConvertPenStyle(M_PENDATA.style());
+}
+
+wxPenJoin wxPen::GetJoin() const
+{
+    return ConvertPenJoinStyle(M_PENDATA.joinStyle());
+}
+
+wxPenCap wxPen::GetCap() const
+{
+    return ConvertPenCapStyle(M_PENDATA.capStyle());
+}
+
+int wxPen::GetWidth() const
+{
+    return M_PENDATA.width();
+}
+
+int wxPen::GetDashes(wxDash **ptr) const
+{
+    *ptr = (wxDash *)((wxPenRefData *)m_refData)->m_dashes;
+    return ((wxPenRefData *)m_refData)->m_dashesSize;
+}
+
+QPen wxPen::GetHandle() const
+{
+    return M_PENDATA;
+}
+
+wxGDIRefData *wxPen::CreateGDIRefData() const
+{
+    return new wxPenRefData;
+}
+
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxPenRefData(*(wxPenRefData *)data);
+}
diff --git a/src/qt/popupwin.cpp b/src/qt/popupwin.cpp
new file mode 100644
index 0000000000..f178f250cc
--- /dev/null
+++ b/src/qt/popupwin.cpp
@@ -0,0 +1,20 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/popupwin.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/popupwin.h"
+
+wxPopupWindow::wxPopupWindow()
+{
+}
+
+wxPopupWindow::wxPopupWindow(wxWindow *WXUNUSED(parent), int WXUNUSED(flags))
+{
+}
+
diff --git a/src/qt/printdlg.cpp b/src/qt/printdlg.cpp
new file mode 100644
index 0000000000..a59890fc16
--- /dev/null
+++ b/src/qt/printdlg.cpp
@@ -0,0 +1,83 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/printdlg.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/qt/printdlg.h"
+
+wxQtPrintNativeData::wxQtPrintNativeData()
+{
+}
+
+bool wxQtPrintNativeData::TransferTo( wxPrintData &WXUNUSED(data) )
+{
+    return false;
+}
+
+bool wxQtPrintNativeData::TransferFrom( const wxPrintData &WXUNUSED(data) )
+{
+    return false;
+}
+
+bool wxQtPrintNativeData::IsOk() const
+{
+    return false;
+}
+
+//##############################################################################
+
+wxQtPrintDialog::wxQtPrintDialog(wxWindow *WXUNUSED(parent), wxPrintDialogData *WXUNUSED(data))
+{
+}
+
+wxQtPrintDialog::wxQtPrintDialog(wxWindow *WXUNUSED(parent), wxPrintData *WXUNUSED(data))
+{
+}
+
+
+wxPrintDialogData& wxQtPrintDialog::GetPrintDialogData()
+{
+    static wxPrintDialogData s_data;
+
+    return s_data;
+}
+
+wxPrintData& wxQtPrintDialog::GetPrintData()
+{
+    static wxPrintData s_data;
+
+    return s_data;
+}
+
+wxDC *wxQtPrintDialog::GetPrintDC()
+{
+    return NULL;
+}
+
+//##############################################################################
+
+wxQtPageSetupDialog::wxQtPageSetupDialog()
+{
+}
+
+wxQtPageSetupDialog::wxQtPageSetupDialog(wxWindow *WXUNUSED(parent), wxPageSetupDialogData *WXUNUSED(data))
+{
+}
+
+bool wxQtPageSetupDialog::Create(wxWindow *WXUNUSED(parent), wxPageSetupDialogData *WXUNUSED(data))
+{
+    return false;
+}
+
+wxPageSetupDialogData& wxQtPageSetupDialog::GetPageSetupDialogData()
+{
+    static wxPageSetupDialogData s_data;
+
+    return s_data;
+}
+
diff --git a/src/qt/printqt.cpp b/src/qt/printqt.cpp
new file mode 100644
index 0000000000..adf1d7b6d9
--- /dev/null
+++ b/src/qt/printqt.cpp
@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/printqt.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/print.h"
+
+wxQtPrinter::wxQtPrinter( wxPrintDialogData *WXUNUSED(data))
+{
+}
+
+bool wxQtPrinter::Setup(wxWindow *WXUNUSED(parent))
+{
+    return false;
+}
+
+bool wxQtPrinter::Print(wxWindow *WXUNUSED(parent), wxPrintout *WXUNUSED(printout), bool WXUNUSED(prompt))
+{
+    return false;
+}
+
+wxDC* wxQtPrinter::PrintDialog(wxWindow *WXUNUSED(parent))
+{
+    return NULL;
+}
+
+//##############################################################################
+
+wxQtPrintPreview::wxQtPrintPreview(wxPrintout *printout,
+                      wxPrintout *printoutForPrinting,
+                      wxPrintDialogData *data)
+    : wxPrintPreviewBase( printout, printoutForPrinting, data )
+{
+}
+
+wxQtPrintPreview::wxQtPrintPreview(wxPrintout *printout,
+                      wxPrintout *printoutForPrinting,
+                      wxPrintData *data)
+    : wxPrintPreviewBase( printout, printoutForPrinting, data )
+{
+}
+
+bool wxQtPrintPreview::Print(bool WXUNUSED(interactive))
+{
+    return false;
+}
+
+void wxQtPrintPreview::DetermineScaling()
+{
+}
+
diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp
new file mode 100644
index 0000000000..74242cefd2
--- /dev/null
+++ b/src/qt/radiobox.cpp
@@ -0,0 +1,243 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/radiobox.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/radiobox.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+
+
+class wxQtRadioBox : public wxQtEventSignalHandler< QGroupBox, wxRadioBox >
+{
+public:
+    wxQtRadioBox( wxWindow *parent, wxRadioBox *handler ):
+        wxQtEventSignalHandler< QGroupBox, wxRadioBox >( parent, handler ){}
+};
+
+
+class wxQtButtonGroup : public wxQtSignalHandler< wxRadioBox >, public QButtonGroup
+{
+public:
+    wxQtButtonGroup( QGroupBox *parent, wxRadioBox *handler ):
+        wxQtSignalHandler< wxRadioBox >(handler ),
+        QButtonGroup(parent)
+    {
+        connect(this,
+                static_cast<void (QButtonGroup::*)(int index)>(&QButtonGroup::buttonClicked),
+                this, &wxQtButtonGroup::buttonClicked);
+    }
+private:
+    void buttonClicked(int index);
+};
+
+void wxQtButtonGroup::buttonClicked(int index) {
+    wxRadioBox *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_RADIOBOX, handler->GetId() );
+        event.SetInt(index);
+        event.SetString(wxQtConvertString(button(index)->text()));
+        EmitEvent( event );
+    }
+}
+
+
+IMPLEMENT_DYNAMIC_CLASS( wxRadioBox, wxControl )
+
+
+wxRadioBox::wxRadioBox()
+{
+}
+
+wxRadioBox::wxRadioBox(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           int n, const wxString choices[],
+           int majorDim,
+           long style,
+           const wxValidator& val,
+           const wxString& name)
+{
+    Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
+}
+
+wxRadioBox::wxRadioBox(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           int majorDim,
+           long style,
+           const wxValidator& val,
+           const wxString& name)
+{
+    Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
+}
+
+
+
+bool wxRadioBox::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            int majorDim,
+            long style,
+            const wxValidator& val,
+            const wxString& name)
+{
+    return Create( parent, id, title, pos, size, choices.size(), &choices[ 0 ],
+        majorDim, style, val, name );
+
+}
+
+
+template < typename Button >
+static void AddChoices( QButtonGroup *qtButtonGroup, QBoxLayout *qtBoxLayout, int count, const wxString choices[] )
+{
+    Button *btn;
+    while ( count-- > 0 )
+    {
+        btn = new Button( wxQtConvertString( *choices++ ));
+        qtButtonGroup->addButton( btn );
+        qtBoxLayout->addWidget( btn );
+    }
+}
+
+
+bool wxRadioBox::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            int n, const wxString choices[],
+            int WXUNUSED(majorDim),
+            long style,
+            const wxValidator& val,
+            const wxString& name)
+{
+    m_qtGroupBox = new wxQtRadioBox( parent, this );
+    m_qtGroupBox->setTitle( wxQtConvertString( title ) );
+    m_qtButtonGroup = new wxQtButtonGroup( m_qtGroupBox, this );
+
+    if ( style & wxRA_SPECIFY_ROWS )
+        m_qtBoxLayout = new QHBoxLayout;
+    else if ( style & wxRA_SPECIFY_COLS )
+        m_qtBoxLayout = new QVBoxLayout;
+
+    AddChoices< QRadioButton >( m_qtButtonGroup, m_qtBoxLayout, n, choices );
+    m_qtBoxLayout->addStretch(1);
+    m_qtGroupBox->setLayout(m_qtBoxLayout);
+
+    return QtCreateControl( parent, id, pos, size, style, val, name );
+}
+
+static QAbstractButton *GetButtonAt( const QButtonGroup *group, unsigned int n )
+{
+    // It might be possible to coerce QButtonGroup::setId() and QButtonGroup::button( id )
+    // to retrieve the button via an index. But for now the approach via QButtonGroup::buttons()
+    // should be fast enough.
+
+    QList< QAbstractButton * > buttons = group->buttons();
+    return n < static_cast< unsigned >( buttons.size() ) ? buttons.at( n ) : NULL;
+}
+
+#define INVALID_INDEX_MESSAGE wxT( "invalid radio box index" )
+
+#define CHECK_BUTTON( button, rc ) \
+    wxCHECK_MSG( button != NULL, rc, INVALID_INDEX_MESSAGE )
+
+bool wxRadioBox::Enable(unsigned int n, bool enable)
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    CHECK_BUTTON( qtButton, false );
+
+    qtButton->setEnabled( enable );
+    return true;
+}
+
+bool wxRadioBox::Show(unsigned int n, bool show)
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    CHECK_BUTTON( qtButton, false );
+
+    qtButton->setVisible( show );
+    return true;
+}
+
+bool wxRadioBox::IsItemEnabled(unsigned int n) const
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    CHECK_BUTTON( qtButton, false );
+
+    return qtButton->isEnabled();
+}
+
+bool wxRadioBox::IsItemShown(unsigned int n) const
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    CHECK_BUTTON( qtButton, false );
+
+    return qtButton->isVisible();
+}
+
+unsigned wxRadioBox::GetCount() const
+{
+    QList< QAbstractButton * > buttons = m_qtButtonGroup->buttons();
+    return buttons.size();
+}
+
+wxString wxRadioBox::GetString(unsigned int n) const
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    CHECK_BUTTON( qtButton, wxEmptyString );
+
+    return wxQtConvertString( qtButton->text() );
+}
+
+void wxRadioBox::SetString(unsigned int n, const wxString& s)
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    wxCHECK_RET( qtButton != NULL, INVALID_INDEX_MESSAGE );
+
+    qtButton->setText( wxQtConvertString( s ));
+}
+
+void wxRadioBox::SetSelection(int n)
+{
+    QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n );
+    wxCHECK_RET( qtButton != NULL, INVALID_INDEX_MESSAGE );
+    qtButton->setChecked( true );
+}
+
+int wxRadioBox::GetSelection() const
+{
+    QAbstractButton *qtButton = m_qtButtonGroup->checkedButton();
+    if ( qtButton != NULL )
+    {
+        QList< QAbstractButton * > buttons = m_qtButtonGroup->buttons();
+        return buttons.indexOf( qtButton );
+    }
+    else
+        return wxNOT_FOUND;
+}
+
+QGroupBox *wxRadioBox::GetHandle() const
+{
+    return m_qtGroupBox;
+}
+
diff --git a/src/qt/radiobut.cpp b/src/qt/radiobut.cpp
new file mode 100644
index 0000000000..00fafd8a18
--- /dev/null
+++ b/src/qt/radiobut.cpp
@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/radiobut.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/radiobut.h"
+#include "wx/qt/private/converter.h"
+
+wxRadioButton::wxRadioButton()
+{
+}
+
+wxRadioButton::wxRadioButton( wxWindow *parent,
+               wxWindowID id,
+               const wxString& label,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style,
+               const wxValidator& validator,
+               const wxString& name)
+{
+    Create( parent, id, label, pos, size, style, validator, name );
+}
+
+bool wxRadioButton::Create( wxWindow *parent,
+             wxWindowID id,
+             const wxString& label,
+             const wxPoint& pos,
+             const wxSize& size,
+             long style,
+             const wxValidator& validator,
+             const wxString& name)
+{
+    m_qtRadioButton = new QRadioButton( parent->GetHandle() );
+    m_qtRadioButton->setText( wxQtConvertString( label ));
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+void wxRadioButton::SetValue(bool value)
+{
+    m_qtRadioButton->setChecked( value );
+}
+
+bool wxRadioButton::GetValue() const
+{
+    return m_qtRadioButton->isChecked();
+}
+
+QRadioButton *wxRadioButton::GetHandle() const
+{
+    return m_qtRadioButton;
+}
diff --git a/src/qt/region.cpp b/src/qt/region.cpp
new file mode 100644
index 0000000000..b2b0ff4ed1
--- /dev/null
+++ b/src/qt/region.cpp
@@ -0,0 +1,349 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/region.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/region.h"
+#include "wx/bitmap.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/utils.h"
+
+#include <QtGui/QRegion>
+#include <QtGui/QBitmap>
+
+class wxRegionRefData: public wxGDIRefData
+{
+    public:
+        wxRegionRefData()
+        {
+        }
+
+        wxRegionRefData( QRect r ) : m_qtRegion( r )
+        {
+        }
+
+        wxRegionRefData( QBitmap b ) : m_qtRegion ( b )
+        {
+        }
+
+        wxRegionRefData( QPolygon p, Qt::FillRule fr ) : m_qtRegion( p, fr )
+        {
+        }
+        
+        wxRegionRefData( const wxRegionRefData& data )
+        : wxGDIRefData()
+        {
+            m_qtRegion = data.m_qtRegion;
+        }
+        
+        bool operator == (const wxRegionRefData& data) const
+        {
+            return m_qtRegion == data.m_qtRegion;
+        }
+        
+        QRegion m_qtRegion;
+};
+
+#define M_REGIONDATA ((wxRegionRefData *)m_refData)->m_qtRegion
+
+wxRegion::wxRegion()
+{
+    m_refData = new wxRegionRefData();
+}
+
+wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+{
+    m_refData = new wxRegionRefData( QRect( x, y, w, h ) );
+}
+
+wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
+{
+    m_refData = new wxRegionRefData( QRect( wxQtConvertPoint( topLeft ),
+                                           wxQtConvertPoint( bottomRight ) ) );
+}
+
+wxRegion::wxRegion(const wxRect& rect)
+{
+    m_refData = new wxRegionRefData( wxQtConvertRect( rect ) );
+}
+
+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
+{
+    QVector< QPoint > qtPoints;
+    for ( uint i = 0; i < n; i++)
+    {
+        qtPoints << wxQtConvertPoint( points[i] );
+    }
+    QPolygon p( qtPoints );
+
+    Qt::FillRule fillingRule = fillStyle == wxODDEVEN_RULE ? Qt::OddEvenFill : Qt::WindingFill;
+    m_refData = new wxRegionRefData( p, fillingRule );
+}
+
+wxRegion::wxRegion(const wxBitmap& bmp)
+{
+    if ( bmp.GetMask() != NULL )
+        m_refData = new wxRegionRefData( *bmp.GetMask()->GetHandle() );
+    else
+        m_refData = new wxRegionRefData( QRect( 0, 0, bmp.GetWidth(), bmp.GetHeight() ) );
+}
+
+wxRegion::wxRegion(const wxBitmap& WXUNUSED(bmp), const wxColour& WXUNUSED(transp), int WXUNUSED(tolerance))
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+}
+
+bool wxRegion::IsEmpty() const
+{
+    wxCHECK_MSG( IsOk(), true, "Invalid region" );
+    
+    return M_REGIONDATA.isEmpty();
+}
+
+void wxRegion::Clear()
+{
+    wxCHECK_RET( IsOk(), "Invalid region" );
+
+    AllocExclusive();
+    M_REGIONDATA = QRegion();
+}
+
+void wxRegion::QtSetRegion(QRegion region)
+{
+    M_REGIONDATA = region;
+}
+
+wxGDIRefData *wxRegion::CreateGDIRefData() const
+{
+    return new wxRegionRefData;
+}
+
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxRegionRefData(*(wxRegionRefData *)data);
+}
+
+bool wxRegion::DoIsEqual(const wxRegion& region) const
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "Invalid parameter region" );
+    
+    return M_REGIONDATA == region.GetHandle();
+}
+
+bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+
+    QRect bounding = M_REGIONDATA.boundingRect();
+    x = bounding.x();
+    y = bounding.y();
+    w = bounding.width();
+    h = bounding.height();
+    
+    return true;
+}
+
+wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
+{
+    wxCHECK_MSG( IsOk(), wxOutRegion, "Invalid region" );
+    
+    return M_REGIONDATA.contains( QPoint( x, y ) ) ? wxInRegion : wxOutRegion;
+}
+
+wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const
+{
+    wxCHECK_MSG( IsOk(), wxOutRegion, "Invalid region" );
+    
+    return M_REGIONDATA.contains( wxQtConvertRect( rect ) ) ? wxInRegion : wxOutRegion;
+}
+
+bool wxRegion::DoOffset(wxCoord x, wxCoord y)
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+
+    M_REGIONDATA.translate( x, y );
+    return true;
+}
+
+bool wxRegion::DoUnionWithRect(const wxRect& rect)
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+
+    M_REGIONDATA = M_REGIONDATA.united( wxQtConvertRect( rect ) );
+    return true;
+}
+
+bool wxRegion::DoUnionWithRegion(const wxRegion& region)
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "Invalid parameter region" );
+    
+    M_REGIONDATA = M_REGIONDATA.united( region.GetHandle() );
+    return true;
+}
+
+bool wxRegion::DoIntersect(const wxRegion& region)
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "Invalid parameter region" );
+    
+    M_REGIONDATA = M_REGIONDATA.intersected( region.GetHandle() );
+    return true;
+}
+
+bool wxRegion::DoSubtract(const wxRegion& region)
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "Invalid parameter region" );
+    
+    M_REGIONDATA = M_REGIONDATA.subtracted( region.GetHandle() );
+    return true;
+}
+
+bool wxRegion::DoXor(const wxRegion& region)
+{
+    wxCHECK_MSG( IsOk(), false, "Invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "Invalid parameter region" );
+    
+    M_REGIONDATA = M_REGIONDATA.xored( region.GetHandle() );
+    return true;
+}
+
+QRegion wxRegion::GetHandle() const
+{
+    wxCHECK_MSG( IsOk(), QRegion(), "Invalid region" );
+
+    return M_REGIONDATA;
+}
+
+//##############################################################################
+
+wxRegionIterator::wxRegionIterator()
+{
+    m_qtRects = NULL;
+    m_pos = 0;
+}
+
+wxRegionIterator::wxRegionIterator(const wxRegion& region)
+{
+    m_qtRects = new QVector< QRect >( region.GetHandle().rects() );
+    m_pos = 0;
+}
+
+wxRegionIterator::wxRegionIterator(const wxRegionIterator& ri)
+{
+    m_qtRects = new QVector< QRect >( *ri.m_qtRects );
+    m_pos = ri.m_pos;
+}
+
+wxRegionIterator::~wxRegionIterator()
+{
+    if ( m_qtRects != NULL )
+        delete m_qtRects;
+}
+
+wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri)
+{
+    if ( m_qtRects != NULL )
+        delete m_qtRects;
+    
+    m_qtRects = new QVector< QRect >( *ri.m_qtRects );
+    m_pos = ri.m_pos;    
+    return *this;
+}
+
+void wxRegionIterator::Reset()
+{
+    m_pos = 0;
+}
+
+void wxRegionIterator::Reset(const wxRegion& region)
+{
+    if ( m_qtRects != NULL )
+        delete m_qtRects;
+
+    m_qtRects = new QVector< QRect >( region.GetHandle().rects() );
+    m_pos = 0;
+}
+
+bool wxRegionIterator::HaveRects() const
+{
+    wxCHECK_MSG( m_qtRects != NULL, false, "Invalid iterator" );
+    
+    return m_pos < m_qtRects->size();
+}
+
+wxRegionIterator::operator bool () const
+{
+    return HaveRects();
+}
+
+wxRegionIterator& wxRegionIterator::operator ++ ()
+{
+    m_pos++;
+    return *this;
+}
+
+wxRegionIterator wxRegionIterator::operator ++ (int)
+{
+    wxRegionIterator copy(*this);
+    ++*this;
+    return copy;
+}
+
+wxCoord wxRegionIterator::GetX() const
+{
+    wxCHECK_MSG( m_qtRects != NULL, 0, "Invalid iterator" );
+    wxCHECK_MSG( m_pos < m_qtRects->size(), 0, "Invalid position" );
+    
+    return m_qtRects->at( m_pos ).x();
+}
+
+wxCoord wxRegionIterator::GetY() const
+{
+    wxCHECK_MSG( m_qtRects != NULL, 0, "Invalid iterator" );
+    wxCHECK_MSG( m_pos < m_qtRects->size(), 0, "Invalid position" );
+    
+    return m_qtRects->at( m_pos ).y();
+}
+
+wxCoord wxRegionIterator::GetW() const
+{
+    return GetWidth();
+}
+
+wxCoord wxRegionIterator::GetWidth() const
+{
+    wxCHECK_MSG( m_qtRects != NULL, 0, "Invalid iterator" );
+    wxCHECK_MSG( m_pos < m_qtRects->size(), 0, "Invalid position" );
+    
+    return m_qtRects->at( m_pos ).width();
+}
+
+wxCoord wxRegionIterator::GetH() const
+{
+    return GetHeight();
+}
+
+wxCoord wxRegionIterator::GetHeight() const
+{
+    wxCHECK_MSG( m_qtRects != NULL, 0, "Invalid iterator" );
+    wxCHECK_MSG( m_pos < m_qtRects->size(), 0, "Invalid position" );
+    
+    return m_qtRects->at( m_pos ).height();
+}
+
+wxRect wxRegionIterator::GetRect() const
+{
+    wxCHECK_MSG( m_qtRects != NULL, wxRect(), "Invalid iterator" );
+    wxCHECK_MSG( m_pos < m_qtRects->size(), wxRect(), "Invalid position" );
+    
+    return wxQtConvertRect( m_qtRects->at( m_pos ) );
+}
+
diff --git a/src/qt/scrolbar.cpp b/src/qt/scrolbar.cpp
new file mode 100644
index 0000000000..ead7d17d44
--- /dev/null
+++ b/src/qt/scrolbar.cpp
@@ -0,0 +1,189 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/scrolbar.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/scrolbar.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtScrollBar : public wxQtEventSignalHandler< QScrollBar, wxScrollBar >
+{
+    
+    public:
+        wxQtScrollBar( wxWindow *parent, wxScrollBar *handler );
+                       
+    private:
+        void actionTriggered( int action );
+        void sliderReleased();
+        void valueChanged( int position );
+};
+
+
+wxScrollBar::wxScrollBar()
+{
+}
+
+wxScrollBar::wxScrollBar( wxWindow *parent, wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size,
+       long style,
+       const wxValidator& validator,
+       const wxString& name)
+{
+    Create( parent, id, pos, size, style, validator, name );
+}
+
+bool wxScrollBar::Create( wxWindow *parent, wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size,
+       long style,
+       const wxValidator& validator,
+       const wxString& name)
+{
+    m_qtScrollBar = new wxQtScrollBar( parent, this );
+    m_qtScrollBar->setOrientation( wxQtConvertOrientation( style, wxSB_HORIZONTAL ));
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+int wxScrollBar::GetThumbPosition() const
+{
+    wxCHECK_MSG( m_qtScrollBar, 0, "Invalid QScrollbar" );
+
+    return m_qtScrollBar->value();
+}
+
+int wxScrollBar::GetThumbSize() const
+{
+    wxCHECK_MSG( m_qtScrollBar, 0, "Invalid QScrollbar" );
+
+    return m_qtScrollBar->pageStep();
+}
+
+int wxScrollBar::GetPageSize() const
+{
+    wxCHECK_MSG( m_qtScrollBar, 0, "Invalid QScrollbar" );
+
+    return m_qtScrollBar->pageStep();
+}
+
+int wxScrollBar::GetRange() const
+{
+    wxCHECK_MSG( m_qtScrollBar, 0, "Invalid QScrollbar" );
+
+    return m_qtScrollBar->maximum();
+}
+
+void wxScrollBar::SetThumbPosition(int viewStart)
+{
+    wxCHECK_RET( m_qtScrollBar, "Invalid QScrollbar" );
+
+    m_qtScrollBar->setValue( viewStart );
+}
+
+void wxScrollBar::SetScrollbar(int position, int WXUNUSED(thumbSize),
+                          int range, int pageSize,
+                          bool WXUNUSED(refresh))
+{
+    wxCHECK_RET( m_qtScrollBar, "Invalid QScrollbar" );
+
+    // Configure the scrollbar
+    if (range != 0 )
+    {
+        m_qtScrollBar->setRange( 0, range - pageSize );
+        m_qtScrollBar->setPageStep( pageSize );
+        m_qtScrollBar->setValue( position );
+        m_qtScrollBar->show();
+    }
+    else
+    {
+        // If range is zero, hide it
+        m_qtScrollBar->hide();
+    }
+}
+
+QScrollBar *wxScrollBar::GetHandle() const
+{
+    return m_qtScrollBar;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// wxQtScrollBar
+/////////////////////////////////////////////////////////////////////////////
+
+wxQtScrollBar::wxQtScrollBar( wxWindow *parent, wxScrollBar *handler )
+    : wxQtEventSignalHandler< QScrollBar, wxScrollBar >( parent, handler )
+{
+    connect( this, &QScrollBar::actionTriggered, this, &wxQtScrollBar::actionTriggered );
+    connect( this, &QScrollBar::sliderReleased, this, &wxQtScrollBar::sliderReleased );
+    connect( this, &QScrollBar::valueChanged, this, &wxQtScrollBar::valueChanged );
+}
+
+
+void wxQtScrollBar::actionTriggered( int action )
+{
+    wxEventType eventType = wxEVT_NULL;
+    switch( action )
+    {
+        case QAbstractSlider::SliderSingleStepAdd:
+            eventType = wxEVT_SCROLL_LINEDOWN;
+            break;
+        case QAbstractSlider::SliderSingleStepSub:
+            eventType = wxEVT_SCROLL_LINEUP;
+            break;
+        case QAbstractSlider::SliderPageStepAdd:
+            eventType = wxEVT_SCROLL_PAGEDOWN;
+            break;
+        case QAbstractSlider::SliderPageStepSub:
+            eventType = wxEVT_SCROLL_PAGEUP;
+            break;
+        case QAbstractSlider::SliderToMinimum:
+            eventType = wxEVT_SCROLL_TOP;
+            break;
+        case QAbstractSlider::SliderToMaximum:
+            eventType = wxEVT_SCROLL_BOTTOM;
+            break;
+        case QAbstractSlider::SliderMove:
+            eventType = wxEVT_SCROLL_THUMBTRACK;
+            break;
+        default:
+            return;
+    }
+    
+    wxScrollBar *handler = GetHandler();
+    if ( handler )
+    {
+        wxScrollEvent e( eventType, handler->GetId(), sliderPosition(),
+                wxQtConvertOrientation( orientation() ));
+        EmitEvent( e );
+    }
+}
+
+void wxQtScrollBar::sliderReleased()
+{
+    wxScrollBar *handler = GetHandler();
+    if ( handler )
+    {
+        wxScrollEvent e( wxEVT_SCROLL_THUMBRELEASE, handler->GetId(), sliderPosition(),
+                wxQtConvertOrientation( orientation() ));
+        EmitEvent( e );
+    }
+}
+
+void wxQtScrollBar::valueChanged( int position )
+{
+    wxScrollBar *handler = GetHandler();
+    if ( handler )
+    {
+        wxScrollEvent e( wxEVT_SCROLL_CHANGED, handler->GetId(), position,
+                wxQtConvertOrientation( orientation() ));
+        EmitEvent( e );
+    }
+}
diff --git a/src/qt/settings.cpp b/src/qt/settings.cpp
new file mode 100644
index 0000000000..83b3ea5016
--- /dev/null
+++ b/src/qt/settings.cpp
@@ -0,0 +1,227 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/settings.cpp
+// Author:      Mariano Reingart, Peter Most
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/settings.h"
+#include "wx/qt/private/converter.h"
+#include <QtGui/QPalette>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QStyle>
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
+{
+    QPalette pal = qApp->palette();
+    QColor color;
+    switch (index)
+    {
+        case wxSYS_COLOUR_SCROLLBAR:
+        case wxSYS_COLOUR_BACKGROUND:
+        //case wxSYS_COLOUR_DESKTOP:
+        case wxSYS_COLOUR_INACTIVECAPTION:
+        case wxSYS_COLOUR_MENU:
+        case wxSYS_COLOUR_WINDOWFRAME:
+        case wxSYS_COLOUR_ACTIVEBORDER:
+        case wxSYS_COLOUR_INACTIVEBORDER:
+            color = pal.color(QPalette::Window);
+            break;
+
+        //case wxSYS_COLOUR_3DFACE:
+        case wxSYS_COLOUR_3DLIGHT:
+            color = pal.color(QPalette::Light);
+            break;
+
+        case wxSYS_COLOUR_BTNFACE:
+            color = pal.color(QPalette::Button);
+            break;
+
+        case wxSYS_COLOUR_WINDOW:
+            color = pal.color(QPalette::Base);
+            break;
+
+        case wxSYS_COLOUR_MENUBAR:
+            color = pal.window().color();
+            break;
+
+        case wxSYS_COLOUR_3DDKSHADOW:
+            color = pal.color(QPalette::Shadow);
+            break;
+
+        case wxSYS_COLOUR_BTNSHADOW:
+            color = pal.color(QPalette::Dark);
+            break;
+
+        case wxSYS_COLOUR_GRAYTEXT:
+        //case wxSYS_COLOUR_3DSHADOW:
+            color = pal.color(QPalette::Disabled, QPalette::Text);
+            break;
+
+        case wxSYS_COLOUR_BTNHIGHLIGHT:
+        //case wxSYS_COLOUR_BTNHILIGHT:
+        //case wxSYS_COLOUR_3DHIGHLIGHT:
+        //case wxSYS_COLOUR_3DHILIGHT:
+            color = pal.color(QPalette::Light);
+            break;
+
+        case wxSYS_COLOUR_HIGHLIGHT:
+            color = pal.highlight().color();
+            break;
+
+        case wxSYS_COLOUR_LISTBOX:
+            color = pal.base().color();
+            break;
+
+        case wxSYS_COLOUR_LISTBOXTEXT:
+            color = pal.color(QPalette::WindowText);
+            break;
+
+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
+            // This is for the text in a list control (or tree) when the
+            // item is selected, but not focused
+            color = pal.color(QPalette::HighlightedText);
+            break;
+
+        case wxSYS_COLOUR_WINDOWTEXT:
+            color = pal.color(QPalette::Text);
+            break;
+
+        case wxSYS_COLOUR_MENUTEXT:
+        case wxSYS_COLOUR_CAPTIONTEXT:
+        case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+        case wxSYS_COLOUR_BTNTEXT:
+            color = pal.color(QPalette::ButtonText);
+            break;
+
+        case wxSYS_COLOUR_INFOBK:
+            color = pal.color(QPalette::ToolTipBase);
+            break;
+
+        case wxSYS_COLOUR_INFOTEXT:
+            color = pal.color(QPalette::ToolTipText);
+            break;
+
+        case wxSYS_COLOUR_HIGHLIGHTTEXT:
+            color = pal.color(QPalette::BrightText);
+            break;
+
+        case wxSYS_COLOUR_APPWORKSPACE:
+            color = QColor(Qt::white);    // ?
+            break;
+
+        case wxSYS_COLOUR_ACTIVECAPTION:
+        case wxSYS_COLOUR_MENUHILIGHT:
+            color = pal.color(QPalette::Highlight);
+            break;
+
+        case wxSYS_COLOUR_HOTLIGHT:
+        case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+        case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+            // TODO
+            color = QColor(Qt::black);
+            break;
+
+        case wxSYS_COLOUR_MAX:
+        default:
+            wxFAIL_MSG( wxT("unknown system colour index") );
+            color = QColor(Qt::white);
+            break;
+    }
+
+    return wxColor( color.red(), color.green(), color.blue(), color.alpha() );
+}
+
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+{
+    wxFont font;
+    switch (index)
+    {
+        case wxSYS_OEM_FIXED_FONT:
+        case wxSYS_ANSI_FIXED_FONT:
+        case wxSYS_SYSTEM_FIXED_FONT:
+            // let Qt font matching algorithm to select the font
+            font.SetFamily(wxFONTFAMILY_TELETYPE);
+            font.SetFaceName("monospace");
+            break;
+
+        case wxSYS_ANSI_VAR_FONT:
+        case wxSYS_SYSTEM_FONT:
+        case wxSYS_DEVICE_DEFAULT_FONT:
+        case wxSYS_DEFAULT_GUI_FONT:
+        default:
+            // let Qt font matching algorithm to select the font
+            font.SetFamily(wxFONTFAMILY_DEFAULT);
+            font.SetFaceName("");
+            break;
+    }
+
+    wxASSERT( font.IsOk() );
+
+    return font;
+
+}
+
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow * WXUNUSED(win))
+{
+    switch (index)
+    {
+        case wxSYS_BORDER_X:
+        case wxSYS_BORDER_Y:
+        case wxSYS_EDGE_X:
+        case wxSYS_EDGE_Y:
+        case wxSYS_FRAMESIZE_X:
+        case wxSYS_FRAMESIZE_Y:
+            return QApplication::style()->pixelMetric(QStyle::PM_FocusFrameVMargin);
+
+
+        case wxSYS_CURSOR_X:
+        case wxSYS_CURSOR_Y:
+            return 32;         // default recomended in docs
+
+        case wxSYS_DCLICK_X:
+        case wxSYS_DCLICK_Y:
+            return QApplication::startDragDistance();
+
+        case wxSYS_DCLICK_MSEC:
+            return QApplication::doubleClickInterval();
+
+        case wxSYS_DRAG_X:
+        case wxSYS_DRAG_Y:
+            return QApplication::style()->pixelMetric(QStyle::PM_ScrollBarSliderMin);
+
+        case wxSYS_ICON_X:
+        case wxSYS_ICON_Y:
+            return QApplication::style()->pixelMetric(QStyle::PM_IconViewIconSize);
+
+        case wxSYS_SCREEN_X:
+            return QApplication::desktop()->screenGeometry().width();
+
+        case wxSYS_SCREEN_Y:
+            return QApplication::desktop()->screenGeometry().height();
+
+        case wxSYS_HSCROLL_Y:
+        case wxSYS_VSCROLL_X:
+            return QApplication::style()->pixelMetric(QStyle::PM_ScrollBarSliderMin);
+
+        case wxSYS_CAPTION_Y:
+            return QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight);
+
+        case wxSYS_PENWINDOWS_PRESENT:
+            // No MS Windows for Pen computing extension available in X11 based gtk+.
+            return 0;
+
+        default:
+            return -1;   // metric is unknown
+    }
+}
+
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature WXUNUSED(index))
+{
+    return false;
+}
+
diff --git a/src/qt/slider.cpp b/src/qt/slider.cpp
new file mode 100644
index 0000000000..55161736cd
--- /dev/null
+++ b/src/qt/slider.cpp
@@ -0,0 +1,153 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/slider.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/slider.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtSlider : public wxQtEventSignalHandler< QSlider, wxSlider >
+{
+public:
+    wxQtSlider( wxWindow *parent, wxSlider *handler );
+
+private:
+    void valueChanged(int position);
+};
+
+wxQtSlider::wxQtSlider( wxWindow *parent, wxSlider *handler )
+    : wxQtEventSignalHandler< QSlider, wxSlider >( parent, handler )
+{
+    connect(this, &QSlider::valueChanged, this, &wxQtSlider::valueChanged);
+}
+
+void wxQtSlider::valueChanged(int position)
+{
+    wxSlider *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_SLIDER, handler->GetId() );
+        event.SetInt( position );
+        EmitEvent( event );
+    }
+}
+
+
+wxSlider::wxSlider()
+{
+}
+
+wxSlider::wxSlider(wxWindow *parent,
+         wxWindowID id,
+         int value, int minValue, int maxValue,
+         const wxPoint& pos,
+         const wxSize& size,
+         long style,
+         const wxValidator& validator,
+         const wxString& name)
+{
+    Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
+}
+
+bool wxSlider::Create(wxWindow *parent,
+            wxWindowID id,
+            int WXUNUSED(value), int minValue, int maxValue,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    m_qtSlider = new wxQtSlider( parent, this );
+    m_qtSlider->setOrientation( wxQtConvertOrientation( style, wxSL_HORIZONTAL ) );
+    SetRange( minValue, maxValue );
+    // draw ticks marks (default bellow if horizontal, right if vertical):
+    if ( style & wxSL_VERTICAL )
+    {
+        m_qtSlider->setTickPosition( style & wxSL_LEFT ? QSlider::TicksLeft :
+                                                         QSlider::TicksRight );
+    }
+    else // horizontal slider
+    {
+        m_qtSlider->setTickPosition( style & wxSL_TOP ? QSlider::TicksAbove :
+                                                        QSlider::TicksBelow );
+    }
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+int wxSlider::GetValue() const
+{
+    return m_qtSlider->value();
+}
+
+void wxSlider::SetValue(int value)
+{
+    m_qtSlider->setValue( value );
+}
+
+void wxSlider::SetRange(int minValue, int maxValue)
+{
+    m_qtSlider->setRange( minValue, maxValue );
+}
+
+int wxSlider::GetMin() const
+{
+    return m_qtSlider->minimum();
+}
+
+int wxSlider::GetMax() const
+{
+    return m_qtSlider->maximum();
+}
+
+void wxSlider::DoSetTickFreq(int freq)
+{
+    m_qtSlider->setTickInterval(freq);
+}
+
+int wxSlider::GetTickFreq() const
+{
+    return m_qtSlider->tickInterval();
+}
+
+void wxSlider::SetLineSize(int WXUNUSED(lineSize))
+{
+}
+
+void wxSlider::SetPageSize(int pageSize)
+{
+    m_qtSlider->setPageStep(pageSize);
+}
+
+int wxSlider::GetLineSize() const
+{
+    return 0;
+}
+
+int wxSlider::GetPageSize() const
+{
+    return m_qtSlider->pageStep();
+}
+
+void wxSlider::SetThumbLength(int WXUNUSED(lenPixels))
+{
+}
+
+int wxSlider::GetThumbLength() const
+{
+    return 0;
+}
+
+
+QSlider *wxSlider::GetHandle() const
+{
+    return m_qtSlider;
+}
+
diff --git a/src/qt/sockqt.cpp b/src/qt/sockqt.cpp
new file mode 100644
index 0000000000..09fa8d9584
--- /dev/null
+++ b/src/qt/sockqt.cpp
@@ -0,0 +1,103 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/sockqt.cpp
+// Purpose:     implementation of wxQT-specific socket event handling
+// Author:      Mariano Reingart
+// Copyright:   (c) 2014 wxWidgets dev team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_SOCKETS
+
+#include "wx/apptrait.h"
+#include "wx/log.h"
+#include "wx/private/fdiomanager.h"
+
+#include <QtCore/QSocketNotifier>
+
+class wxQtFDIONotifier : public QSocketNotifier
+{
+public:
+    wxQtFDIONotifier(int fd, QSocketNotifier::Type type, wxFDIOHandler *handler)
+        : QSocketNotifier(fd, type),
+          m_handler(handler)
+    {
+        setEnabled(true);
+        connect(this, &QSocketNotifier::activated, this, &wxQtFDIONotifier::activated);
+    }
+
+    wxFDIOHandler *handler()
+    {
+        return m_handler;
+    }
+
+    void activated()
+    {
+        switch (type())
+        {
+            case QSocketNotifier::Read:
+                m_handler->OnReadWaiting();
+                break;
+            case QSocketNotifier::Write:
+                m_handler->OnWriteWaiting();
+                break;
+            case QSocketNotifier::Exception:
+                //m_handler->OnExceptionWaiting();
+                break;
+        }
+    }
+    wxFDIOHandler *m_handler;
+};
+
+class QtFDIOManager : public wxFDIOManager
+{
+public:
+    virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d)
+    {
+        QSocketNotifier::Type type;
+        switch (d)
+        {
+            case INPUT:
+                type = QSocketNotifier::Read;
+                break;
+            case OUTPUT:
+                type = QSocketNotifier::Write;
+                break;
+        }
+        m_qtNotifiers.insert(m_qtNotifiers.end(),
+                             new wxQtFDIONotifier(fd, type, handler));
+        handler->SetRegisteredEvent(d);
+        return fd;
+    }
+
+    virtual void
+    RemoveInput(wxFDIOHandler* handler, int fd, Direction d)
+    {
+        QSocketNotifier::Type type = d == INPUT ? QSocketNotifier::Read :
+                                                  QSocketNotifier::Write;
+        for ( wxVector<wxQtFDIONotifier*>::iterator it = m_qtNotifiers.begin();
+              it != m_qtNotifiers.end(); ++it )
+        {
+            wxQtFDIONotifier* notifier = static_cast<wxQtFDIONotifier*>(*it);
+            if ( (notifier->socket() == fd) &&
+                 (notifier->handler() == handler) &&
+                 (notifier->type() == type) )
+            {
+                delete notifier;
+                m_qtNotifiers.erase(it);
+                break;
+            }
+        }
+    }
+    wxVector<wxQtFDIONotifier*> m_qtNotifiers;
+};
+
+wxFDIOManager *wxGUIAppTraits::GetFDIOManager()
+{
+    static QtFDIOManager s_manager;
+    return &s_manager;
+}
+
+#endif // wxUSE_SOCKETS && __UNIX__
diff --git a/src/qt/spinbutt.cpp b/src/qt/spinbutt.cpp
new file mode 100644
index 0000000000..a4e38b39c7
--- /dev/null
+++ b/src/qt/spinbutt.cpp
@@ -0,0 +1,87 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/spinbutt.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/spinbutt.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtSpinButton : public wxQtEventSignalHandler< QSpinBox, wxSpinButton  >
+{
+public:
+    wxQtSpinButton( wxWindow *parent, wxSpinButton *handler );
+
+private:
+    void valueChanged(int value);
+};
+
+wxQtSpinButton::wxQtSpinButton( wxWindow *parent, wxSpinButton *handler )
+    : wxQtEventSignalHandler< QSpinBox, wxSpinButton >( parent, handler )
+{
+    connect(this, static_cast<void (QSpinBox::*)(int index)>(&QSpinBox::valueChanged),
+            this, &wxQtSpinButton::valueChanged);
+}
+
+void wxQtSpinButton::valueChanged(int value)
+{
+    wxSpinButton *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_SPIN, handler->GetId() );
+        event.SetInt( value );
+        EmitEvent( event );
+    }
+}
+
+
+wxSpinButton::wxSpinButton()
+{
+}
+
+wxSpinButton::wxSpinButton(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos,
+             const wxSize& size,
+             long style,
+             const wxString& name)
+{
+    Create( parent, id, pos, size, style, name );
+}
+
+bool wxSpinButton::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    m_qtSpinBox = new wxQtSpinButton( parent, this );
+
+    // Modify the size so that the text field is not visible.
+    // TODO: Find out the width of the buttons i.e. take the style into account (QStyleOptionSpinBox).
+    wxSize newSize( size );
+    newSize.SetWidth( 18 );
+
+    return QtCreateControl( parent, id, pos, newSize, style, wxDefaultValidator, name );
+}
+
+int wxSpinButton::GetValue() const
+{
+    return m_qtSpinBox->value();
+}
+
+void wxSpinButton::SetValue(int val)
+{
+    m_qtSpinBox->setValue( val );
+}
+
+QSpinBox *wxSpinButton::GetHandle() const
+{
+    return m_qtSpinBox;
+}
diff --git a/src/qt/spinctrl.cpp b/src/qt/spinctrl.cpp
new file mode 100644
index 0000000000..26dc2a4f95
--- /dev/null
+++ b/src/qt/spinctrl.cpp
@@ -0,0 +1,272 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/spinctrl.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_SPINCTRL
+
+#include "wx/spinctrl.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+template< typename T, typename Widget >
+wxSpinCtrlQt< T, Widget >::wxSpinCtrlQt()
+{
+}
+
+template< typename T, typename Widget >
+wxSpinCtrlQt< T, Widget >::wxSpinCtrlQt( wxWindow *WXUNUSED(WXUNUSED(parent)), wxWindowID WXUNUSED(WXUNUSED(id)),
+    const wxString& WXUNUSED(WXUNUSED(value)), const wxPoint& WXUNUSED(WXUNUSED(pos)), const wxSize& WXUNUSED(WXUNUSED(size)), long WXUNUSED(WXUNUSED(style)),
+    T WXUNUSED(WXUNUSED(min)), T WXUNUSED(WXUNUSED(max)), T WXUNUSED(WXUNUSED(initial)), T WXUNUSED(WXUNUSED(inc)), const wxString& WXUNUSED(WXUNUSED(name)) )
+{
+}
+
+template< typename T, typename Widget >
+bool wxSpinCtrlQt< T, Widget >::Create( wxWindow *parent, wxWindowID id,
+    const wxString& value, const wxPoint& pos, const wxSize& size, long style,
+    T min, T max, T initial, T inc, const wxString& name )
+{
+    if(!(style & wxSP_ARROW_KEYS))
+        m_qtSpinBox->setButtonSymbols(QAbstractSpinBox::NoButtons);
+
+    if(style & wxSP_WRAP)
+        m_qtSpinBox->setWrapping(true);
+
+    m_qtSpinBox->setAccelerated(true); // to match gtk behavior
+
+    SetValue( initial );
+    SetRange( min, max );
+    SetIncrement( inc );
+
+    if ( !value.IsEmpty() )
+        SetValue( value );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+template< typename T, typename Widget >
+void wxSpinCtrlQt< T, Widget >::SetValue( T val )
+{
+    m_qtSpinBox->setValue( val );
+}
+
+template< typename T, typename Widget >
+void wxSpinCtrlQt< T, Widget >::SetRange( T min, T max )
+{
+    m_qtSpinBox->setRange( min, max );
+}
+
+template< typename T, typename Widget >
+void wxSpinCtrlQt< T, Widget >::SetIncrement( T inc )
+{
+    m_qtSpinBox->setSingleStep( inc );
+}
+
+template< typename T, typename Widget >
+T wxSpinCtrlQt< T, Widget >::GetValue() const
+{
+    return m_qtSpinBox->value();
+}
+
+template< typename T, typename Widget >
+T wxSpinCtrlQt< T, Widget >::GetMin() const
+{
+    return m_qtSpinBox->minimum();
+}
+
+template< typename T, typename Widget >
+T wxSpinCtrlQt< T, Widget >::GetMax() const
+{
+    return m_qtSpinBox->maximum();
+}
+
+template< typename T, typename Widget >
+T wxSpinCtrlQt< T, Widget >::GetIncrement() const
+{
+    return m_qtSpinBox->singleStep();
+}
+
+template< typename T, typename Widget >
+void wxSpinCtrlQt< T, Widget >::SetSnapToTicks(bool WXUNUSED(WXUNUSED(snap_to_ticks)))
+{
+    wxMISSING_FUNCTION();
+}
+
+template< typename T, typename Widget >
+bool wxSpinCtrlQt< T, Widget >::GetSnapToTicks() const
+{
+    wxMISSING_FUNCTION();
+
+    return false;
+}
+
+template< typename T, typename Widget >
+void wxSpinCtrlQt< T, Widget >::SetSelection(long WXUNUSED(WXUNUSED(from)), long WXUNUSED(WXUNUSED(to)))
+{
+    wxMISSING_FUNCTION();
+}
+
+template< typename T, typename Widget >
+Widget *wxSpinCtrlQt< T, Widget >::GetHandle() const
+{
+    return m_qtSpinBox;
+}
+
+
+// Define a derived helper class to get access to valueFromText:
+
+template < typename Widget >
+class wxQtSpinBoxBase : public wxQtEventSignalHandler< Widget, wxControl >
+{
+public:
+    wxQtSpinBoxBase( wxWindow *parent, wxControl *handler )
+        : wxQtEventSignalHandler< Widget, wxControl >( parent, handler )
+    { }
+
+    using Widget::valueFromText;
+};
+
+class wxQtSpinBox : public wxQtSpinBoxBase< QSpinBox >
+{
+public:
+    wxQtSpinBox( wxWindow *parent, wxControl *handler )
+        : wxQtSpinBoxBase< QSpinBox >( parent, handler )
+    {
+        connect(this, static_cast<void (QSpinBox::*)(int index)>(&QSpinBox::valueChanged),
+                this, &wxQtSpinBox::valueChanged);
+    }
+private:
+    void valueChanged(int value);
+};
+
+class wxQtDoubleSpinBox : public wxQtSpinBoxBase< QDoubleSpinBox >
+{
+public:
+    wxQtDoubleSpinBox( wxWindow *parent, wxControl *handler )
+        : wxQtSpinBoxBase< QDoubleSpinBox >( parent, handler )
+    { }
+};
+
+
+//##############################################################################
+
+template class wxSpinCtrlQt< int, QSpinBox >;
+
+wxSpinCtrl::wxSpinCtrl()
+{
+    Init(); 
+}
+
+wxSpinCtrl::wxSpinCtrl(wxWindow *parent, wxWindowID id, const wxString& value,
+    const wxPoint& pos, const wxSize& size, long style,
+    int min, int max, int initial,
+    const wxString& name )
+
+: wxSpinCtrlQt< int, QSpinBox >( parent, id, value, pos, size, style,
+     min, max, initial, 1, name )
+{
+    Init();
+    Create( parent, id, value, pos, size, style, min, max, initial, name );
+}
+
+bool wxSpinCtrl::Create( wxWindow *parent, wxWindowID id, const wxString& value,
+    const wxPoint& pos, const wxSize& size, long style,
+    int min, int max, int initial,
+    const wxString& name )
+{
+    m_qtSpinBox = new wxQtSpinBox( parent, this );
+    return wxSpinCtrlQt< int, QSpinBox >::Create( parent, id, value,
+        pos, size, style, min, max, initial, 1, name );
+}
+
+
+bool wxSpinCtrl::SetBase(int base)
+{
+    // Currently we only support base 10.
+    if ( base != 10 )
+        return false;
+
+    if ( base == m_base )
+        return true;
+
+    m_base = base;
+
+    return true;
+}
+
+void wxSpinCtrl::SetValue( const wxString &value )
+{
+    // valueFromText can be called if m_qtSpinBox is an instance of the helper class
+    wxQtSpinBox * qtSpinBox = dynamic_cast<wxQtSpinBox *> ((QSpinBox *) m_qtSpinBox);
+    if (qtSpinBox != NULL)
+        qtSpinBox->setValue( qtSpinBox->valueFromText( wxQtConvertString( value )));
+}
+
+void wxQtSpinBox::valueChanged(int value)
+{
+    wxControl *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_SPINCTRL, handler->GetId() );
+        event.SetInt( value );
+        EmitEvent( event );
+    }
+}
+
+//##############################################################################
+
+template class wxSpinCtrlQt< double, QDoubleSpinBox >;
+
+wxIMPLEMENT_DYNAMIC_CLASS( wxSpinCtrlDouble, wxSpinCtrlBase );
+
+wxSpinCtrlDouble::wxSpinCtrlDouble()
+{
+}
+
+wxSpinCtrlDouble::wxSpinCtrlDouble(wxWindow *parent, wxWindowID id, const wxString& value,
+    const wxPoint& pos, const wxSize& size, long style,
+    double min, double max, double initial, double inc,
+    const wxString& name )
+
+: wxSpinCtrlQt< double, QDoubleSpinBox >( parent, id, value, pos, size, style,
+        min, max, initial, inc, name )
+{
+    Create( parent, id, value, pos, size, style, min, max, initial, inc, name );
+}
+
+bool wxSpinCtrlDouble::Create(wxWindow *parent, wxWindowID id, const wxString& value,
+    const wxPoint& pos, const wxSize& size, long style,
+    double min, double max, double initial, double inc,
+    const wxString& name )
+{
+    m_qtSpinBox = new wxQtDoubleSpinBox( parent, this );
+    return wxSpinCtrlQt< double, QDoubleSpinBox >::Create( parent, id, value,
+        pos, size, style, min, max, initial, inc, name );
+}
+
+void wxSpinCtrlDouble::SetDigits(unsigned digits)
+{
+    m_qtSpinBox->setDecimals( digits );
+}
+
+unsigned wxSpinCtrlDouble::GetDigits() const
+{
+    return m_qtSpinBox->decimals();
+}
+
+void wxSpinCtrlDouble::SetValue( const wxString &value )
+{
+    // valueFromText can be called if m_qtSpinBox is an instance of the helper class
+    wxQtDoubleSpinBox * qtSpinBox = dynamic_cast<wxQtDoubleSpinBox *> ((QDoubleSpinBox *) m_qtSpinBox);
+    if (qtSpinBox != NULL)
+        qtSpinBox->setValue( qtSpinBox->valueFromText( wxQtConvertString( value )));
+}
+
+
+#endif // wxUSE_SPINCTRL
diff --git a/src/qt/statbmp.cpp b/src/qt/statbmp.cpp
new file mode 100644
index 0000000000..160cf4b8ae
--- /dev/null
+++ b/src/qt/statbmp.cpp
@@ -0,0 +1,86 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/statbmp.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/statbmp.h"
+#include "wx/qt/private/winevent.h"
+
+class wxQtStaticBmp : public wxQtEventSignalHandler< QLabel, wxStaticBitmap >
+{
+public:
+    wxQtStaticBmp( wxWindow *parent, wxStaticBitmap *handler ):
+        wxQtEventSignalHandler< QLabel, wxStaticBitmap >( parent, handler ){}
+};
+
+
+wxStaticBitmap::wxStaticBitmap()
+{
+}
+
+wxStaticBitmap::wxStaticBitmap( wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& label,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxString& name)
+{
+    Create( parent, id, label, pos, size, style, name );
+}
+
+bool wxStaticBitmap::Create( wxWindow *parent,
+             wxWindowID id,
+             const wxBitmap& label,
+             const wxPoint& pos,
+             const wxSize& size,
+             long style,
+             const wxString& name)
+{
+    m_qtLabel = new wxQtStaticBmp( parent, this );
+    SetBitmap( label );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+static void SetPixmap( QLabel *label, const QPixmap *pixMap )
+{
+    if ( pixMap != NULL )
+        label->setPixmap( *pixMap );
+}
+
+void wxStaticBitmap::SetIcon(const wxIcon& icon)
+{
+    SetPixmap( m_qtLabel, icon.GetHandle() );
+}
+
+void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+{
+    SetPixmap( m_qtLabel, bitmap.GetHandle() );
+}
+
+wxBitmap wxStaticBitmap::GetBitmap() const
+{
+    const QPixmap* pix = m_qtLabel->pixmap();
+    if ( pix != NULL )
+        return wxBitmap( *pix );
+    else
+        return wxBitmap();
+}
+
+wxIcon wxStaticBitmap::GetIcon() const
+{
+    wxIcon icon;
+    icon.CopyFromBitmap( GetBitmap() );
+    return icon;
+}
+
+QLabel *wxStaticBitmap::GetHandle() const
+{
+    return m_qtLabel;
+}
diff --git a/src/qt/statbox.cpp b/src/qt/statbox.cpp
new file mode 100644
index 0000000000..be9825e0bb
--- /dev/null
+++ b/src/qt/statbox.cpp
@@ -0,0 +1,64 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/statbox.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/statbox.h"
+#include "wx/window.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QGroupBox>
+
+
+class wxQtGroupBox : public wxQtEventSignalHandler< QGroupBox, wxStaticBox >
+{
+public:
+    wxQtGroupBox( wxWindow *parent, wxStaticBox *handler ):
+        wxQtEventSignalHandler< QGroupBox, wxStaticBox >( parent, handler ){}
+};
+
+
+wxStaticBox::wxStaticBox()
+{
+}
+
+wxStaticBox::wxStaticBox(wxWindow *parent, wxWindowID id,
+            const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    Create( parent, id, label, pos, size, style, name );
+}
+
+bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
+            const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    m_qtGroupBox = new wxQtGroupBox( parent, this );
+    m_qtGroupBox->setTitle( wxQtConvertString( label ) );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+QGroupBox *wxStaticBox::GetHandle() const
+{
+    return m_qtGroupBox;
+}
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
+
+    // need extra space for the label:
+    *borderTop += GetCharHeight();
+}
diff --git a/src/qt/statline.cpp b/src/qt/statline.cpp
new file mode 100644
index 0000000000..0e0227904b
--- /dev/null
+++ b/src/qt/statline.cpp
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/statline.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/statline.h"
+
+wxStaticLine::wxStaticLine()
+{
+}
+
+wxStaticLine::wxStaticLine( wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos,
+              const wxSize& size,
+              long style,
+              const wxString &name)
+{
+    Create( parent, id, pos, size, style, name );
+}
+
+bool wxStaticLine::Create( wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos,
+             const wxSize& size,
+             long style,
+             const wxString &name)
+{
+    m_qtFrame = new QFrame( parent->GetHandle() );
+    if ( style & wxLI_HORIZONTAL )
+        m_qtFrame->setFrameStyle( QFrame::HLine );
+    else if ( style & wxLI_VERTICAL )
+        m_qtFrame->setFrameStyle( QFrame::VLine );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+QFrame *wxStaticLine::GetHandle() const
+{
+    return m_qtFrame;
+}
diff --git a/src/qt/stattext.cpp b/src/qt/stattext.cpp
new file mode 100644
index 0000000000..c55254cf51
--- /dev/null
+++ b/src/qt/stattext.cpp
@@ -0,0 +1,67 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/stattext.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/stattext.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+class wxQtStaticText : public wxQtEventSignalHandler< QLabel, wxStaticText >
+{
+public:
+    wxQtStaticText( wxWindow *parent, wxStaticText *handler ):
+        wxQtEventSignalHandler< QLabel, wxStaticText >( parent, handler ){}
+};
+
+
+wxStaticText::wxStaticText()
+{
+}
+
+wxStaticText::wxStaticText(wxWindow *parent,
+             wxWindowID id,
+             const wxString &label,
+             const wxPoint &pos,
+             const wxSize &size,
+             long style,
+             const wxString &name)
+{
+    Create( parent, id, label, pos, size, style, name );
+}
+
+bool wxStaticText::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString &label,
+            const wxPoint &pos,
+            const wxSize &size,
+            long style,
+            const wxString &name)
+{
+    m_qtLabel = new wxQtStaticText( parent, this );
+    m_qtLabel->setText( wxQtConvertString( label ) );
+
+    // Set the buddy to itself to get the mnemonic key but ensure that we don't have
+    // any unwanted side effects, so disable the interaction:
+
+    m_qtLabel->setBuddy( m_qtLabel );
+    m_qtLabel->setTextInteractionFlags( Qt::NoTextInteraction );
+    m_qtLabel->setWordWrap( true );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+void wxStaticText::SetLabel(const wxString& label)
+{
+    m_qtLabel->setText( wxQtConvertString( label ) );
+}
+
+QLabel *wxStaticText::GetHandle() const
+{
+    return m_qtLabel;
+}
diff --git a/src/qt/statusbar.cpp b/src/qt/statusbar.cpp
new file mode 100644
index 0000000000..5f58a0eba3
--- /dev/null
+++ b/src/qt/statusbar.cpp
@@ -0,0 +1,121 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/statusbar.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/statusbr.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtStatusBar : public wxQtEventSignalHandler< QStatusBar, wxStatusBar >
+{
+
+public:
+    wxQtStatusBar( wxWindow *parent, wxStatusBar *handler );
+};
+
+wxQtStatusBar::wxQtStatusBar( wxWindow *parent, wxStatusBar *handler )
+    : wxQtEventSignalHandler< QStatusBar, wxStatusBar >( parent, handler )
+{
+}
+
+//==============================================================================
+
+wxStatusBar::wxStatusBar(wxWindow *parent, wxWindowID winid,
+            long style,
+            const wxString& name)
+{
+    Create( parent, winid, style, name );
+}
+
+bool wxStatusBar::Create(wxWindow *parent, wxWindowID WXUNUSED(winid),
+                         long style, const wxString& WXUNUSED(name))
+{
+    wxMISSING_IMPLEMENTATION( "wxStatusBar::Create parameters" );
+
+    m_qtStatusBar = new wxQtStatusBar( parent, this );
+
+    if(style & wxSTB_SIZEGRIP)
+        m_qtStatusBar->setSizeGripEnabled(true);
+
+    PostCreation();
+
+    SetFieldsCount(1);
+
+    return true;
+}
+
+bool wxStatusBar::GetFieldRect(int WXUNUSED(i), wxRect& WXUNUSED(rect)) const
+{
+    return false;
+}
+
+void wxStatusBar::SetMinHeight(int WXUNUSED(height))
+{
+}
+
+int wxStatusBar::GetBorderX() const
+{
+    return 0;
+}
+
+int wxStatusBar::GetBorderY() const
+{
+    return 0;
+}
+
+void wxStatusBar::DoUpdateStatusText(int number)
+{
+    m_qtPanes[number]->setText( wxQtConvertString( m_panes[number].GetText() ) );
+}
+
+// Called each time number/size of panes changes
+void wxStatusBar::Refresh( bool eraseBackground, const wxRect *rect )
+{
+    UpdateFields();
+
+    wxWindow::Refresh( eraseBackground, rect );
+}
+
+void wxStatusBar::UpdateFields()
+{
+    // is it a good idea to recreate all the panes every update?
+
+    while ( !m_qtPanes.isEmpty() )
+    {
+        //Remove all panes
+        delete m_qtPanes.takeLast();
+    }
+
+    for (size_t i = 0; i < m_panes.GetCount(); i++)
+    {
+        //Set sizes
+        int width = m_panes[i].GetWidth();
+
+        QLabel *pane = new QLabel( m_qtStatusBar );
+        m_qtPanes.append( pane );
+
+        if ( width >= 0 )
+        {
+            //Fixed width field
+            pane->setMinimumSize( QSize(width, 0) );
+            m_qtStatusBar->addWidget( pane );
+        }
+        else
+        {
+            m_qtStatusBar->addWidget( pane, -width );
+        }
+    }
+}
+
+QStatusBar *wxStatusBar::GetHandle() const
+{
+    return m_qtStatusBar;
+}
diff --git a/src/qt/taskbar.cpp b/src/qt/taskbar.cpp
new file mode 100644
index 0000000000..e90b481093
--- /dev/null
+++ b/src/qt/taskbar.cpp
@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/taskbar.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/taskbar.h"
+
+//=============================================================================
+
+bool wxTaskBarIconBase::IsAvailable()
+{
+    return QSystemTrayIcon::isSystemTrayAvailable();
+}
+
+//=============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS( wxTaskBarIcon, wxTaskBarIconBase )
+
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
+{
+}
+
+bool wxTaskBarIcon::SetIcon(const wxIcon& WXUNUSED(icon),
+             const wxString& WXUNUSED(tooltip))
+{
+    return false;
+}
+
+bool wxTaskBarIcon::RemoveIcon()
+{
+    return false;
+}
+
+bool wxTaskBarIcon::PopupMenu(wxMenu *WXUNUSED(menu))
+{
+    return false;
+}
+
diff --git a/src/qt/textctrl.cpp b/src/qt/textctrl.cpp
new file mode 100644
index 0000000000..166edff9ff
--- /dev/null
+++ b/src/qt/textctrl.cpp
@@ -0,0 +1,371 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/textctrl.cpp
+// Author:      Mariano Reingart, Peter Most
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/textctrl.h"
+#include "wx/settings.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include "wx/qt/private/utils.h"
+
+class wxQtLineEdit : public wxQtEventSignalHandler< QLineEdit, wxTextCtrl >
+{
+public:
+    wxQtLineEdit( wxWindow *parent, wxTextCtrl *handler );
+
+private:
+    void textChanged(const QString &text);
+    void returnPressed();
+};
+
+wxQtLineEdit::wxQtLineEdit( wxWindow *parent, wxTextCtrl *handler )
+    : wxQtEventSignalHandler< QLineEdit, wxTextCtrl >( parent, handler )
+{
+    connect(this, &QLineEdit::textChanged,
+            this, &wxQtLineEdit::textChanged);
+    connect(this, &QLineEdit::returnPressed,
+            this, &wxQtLineEdit::returnPressed);
+}
+
+void wxQtLineEdit::textChanged(const QString &text)
+{
+    wxTextCtrl *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_TEXT, handler->GetId() );
+        event.SetString( wxQtConvertString( text ) );
+        EmitEvent( event );
+    }
+}
+
+void wxQtLineEdit::returnPressed()
+{
+    wxTextCtrl *handler = GetHandler();
+    if ( handler )
+    {
+        if ( handler->HasFlag(wxTE_PROCESS_ENTER) )
+        {
+            wxCommandEvent event( wxEVT_TEXT_ENTER, handler->GetId() );
+            event.SetString( handler->GetValue() );
+            EmitEvent( event );
+        }
+    }
+}
+
+
+class wxQtTextEdit : public wxQtEventSignalHandler< QTextEdit, wxTextCtrl >
+{
+public:
+    wxQtTextEdit( wxWindow *parent, wxTextCtrl *handler );
+
+private:
+    void textChanged();
+};
+
+wxQtTextEdit::wxQtTextEdit( wxWindow *parent, wxTextCtrl *handler )
+    : wxQtEventSignalHandler< QTextEdit, wxTextCtrl >( parent, handler )
+{
+    connect(this, &QTextEdit::textChanged,
+            this, &wxQtTextEdit::textChanged);
+}
+
+void wxQtTextEdit::textChanged()
+{
+    wxTextCtrl *handler = GetHandler();
+    if ( handler )
+    {
+        wxCommandEvent event( wxEVT_TEXT, handler->GetId() );
+        event.SetString( handler->GetValue() );
+        EmitEvent( event );
+    }
+}
+
+
+wxTextCtrl::wxTextCtrl()
+{
+}
+
+wxTextCtrl::wxTextCtrl(wxWindow *parent,
+           wxWindowID id,
+           const wxString &value,
+           const wxPoint &pos,
+           const wxSize &size,
+           long style,
+           const wxValidator& validator,
+           const wxString &name)
+{
+    Create( parent, id, value, pos, size, style, validator, name );
+}
+
+bool wxTextCtrl::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString &value,
+            const wxPoint &pos,
+            const wxSize &size,
+            long style,
+            const wxValidator& validator,
+            const wxString &name)
+{
+    bool multiline = (style & wxTE_MULTILINE) != 0;
+
+    if (!multiline)
+    {
+        m_qtLineEdit = new wxQtLineEdit( parent, this );
+        m_qtTextEdit = NULL;
+    }
+    else
+    {
+        m_qtTextEdit =  new wxQtTextEdit( parent, this );
+        m_qtLineEdit = NULL;
+    }
+    if ( QtCreateControl( parent, id, pos, size, style, validator, name ) )
+    {
+        // set the initial text value without sending the event:
+        // (done here as needs CreateBase called to set flags for IsMultiLine)
+        ChangeValue( value );
+        // set the default inner color (white), as it is replaced by PostCreation
+        SetBackgroundColour( wxSystemSettingsNative::GetColour( wxSYS_COLOUR_LISTBOX ) );
+        return true;
+    }
+    return false;
+}
+
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    return wxTextCtrlBase::DoGetBestSize();
+
+}
+int wxTextCtrl::GetLineLength(long WXUNUSED(lineNo)) const
+{
+    return 0;
+}
+
+wxString wxTextCtrl::GetLineText(long WXUNUSED(lineNo)) const
+{
+    return wxString();
+}
+
+int wxTextCtrl::GetNumberOfLines() const
+{
+    return 0;
+}
+
+bool wxTextCtrl::IsModified() const
+{
+    return false;
+}
+
+void wxTextCtrl::MarkDirty()
+{
+}
+
+void wxTextCtrl::DiscardEdits()
+{
+}
+
+bool wxTextCtrl::SetStyle(long WXUNUSED(start), long WXUNUSED(end), const wxTextAttr& WXUNUSED(style))
+{
+    return false;
+}
+
+bool wxTextCtrl::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
+{
+    return false;
+}
+
+bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& WXUNUSED(style))
+{
+    return false;
+}
+
+long wxTextCtrl::XYToPosition(long WXUNUSED(x), long WXUNUSED(y)) const
+{
+    return 0;
+}
+
+bool wxTextCtrl::PositionToXY(long WXUNUSED(pos), long *WXUNUSED(x), long *WXUNUSED(y)) const
+{
+    return false;
+}
+
+void wxTextCtrl::ShowPosition(long WXUNUSED(pos))
+{
+}
+
+bool wxTextCtrl::DoLoadFile(const wxString& WXUNUSED(file), int WXUNUSED(fileType))
+{
+    return false;
+}
+
+bool wxTextCtrl::DoSaveFile(const wxString& WXUNUSED(file), int WXUNUSED(fileType))
+{
+    return false;
+}
+
+void wxTextCtrl::SetInsertionPoint(long pos)
+{
+    QTextCursor::MoveOperation op;
+    QTextCursor cursor;
+
+    // check if pos indicates end of text:
+    if ( pos == -1 )
+    {
+        pos = 0;
+        op = QTextCursor::End;
+    }
+    else
+    {
+        op = QTextCursor::Start;
+    }
+    if ( !IsMultiLine() )
+    {
+        if (op == QTextCursor::End)
+            m_qtLineEdit->end(false);
+        else
+            m_qtLineEdit->setCursorPosition(pos);
+    }
+    else
+    {
+        cursor = m_qtTextEdit->textCursor();
+        cursor.movePosition(op, QTextCursor::MoveAnchor, pos);
+        m_qtTextEdit->setTextCursor(cursor);
+        m_qtTextEdit->ensureCursorVisible();
+    }
+}
+
+long wxTextCtrl::GetInsertionPoint() const
+{
+    QTextCursor cursor;
+
+    if ( !IsMultiLine() )
+    {
+        return m_qtLineEdit->cursorPosition();
+    }
+    else
+    {
+        cursor = m_qtTextEdit->textCursor();
+        return cursor.position();
+    }
+}
+
+wxString wxTextCtrl::DoGetValue() const
+{
+    if ( IsMultiLine() )
+        return wxQtConvertString( m_qtTextEdit->toPlainText() );
+    else
+        return wxQtConvertString( m_qtLineEdit->text() );
+}
+
+void wxTextCtrl::SetSelection( long from, long to )
+{
+    // SelectAll uses -1 to -1, adjust for qt:
+    if (from == -1 && to == -1)
+    {
+        from = 0;
+        to = GetValue().length();
+    }
+    if ( IsMultiLine() )
+    {
+        QTextCursor cursor = m_qtTextEdit->textCursor();
+        cursor.setPosition(from);
+        cursor.setPosition(to, QTextCursor::KeepAnchor);
+        m_qtTextEdit->setTextCursor(cursor);
+    }
+    else // single line
+    {
+        m_qtLineEdit->setSelection(from, to);
+    }
+}
+
+void wxTextCtrl::GetSelection(long* from, long* to) const
+{
+    if ( IsMultiLine() )
+    {
+        QTextCursor cursor = m_qtTextEdit->textCursor();
+        *from = cursor.selectionStart();
+        *to = cursor.selectionEnd();
+        if(cursor.hasSelection())
+                return;
+    }
+    else // single line
+    {
+        *from = m_qtLineEdit->selectionStart();
+        if ( *from >= 0 )
+        {
+            *to = *from + m_qtLineEdit->selectedText().length();
+            return;
+        }
+    }
+    // No selection, call base for default behaviour:
+    wxTextEntry::GetSelection(from, to);
+}
+
+void wxTextCtrl::WriteText( const wxString &text )
+{
+    // Insert the text
+    if ( !IsMultiLine() )
+    {
+        m_qtLineEdit->insert(wxQtConvertString( text ));
+    }
+    else
+    {
+        m_qtTextEdit->insertPlainText(wxQtConvertString( text ));
+        // the cursor is moved to the end, ensure it is shown
+        m_qtTextEdit->ensureCursorVisible();
+    }
+}
+
+void wxTextCtrl::DoSetValue( const wxString &text, int flags )
+{
+    // do not fire qt signals for certain methods (i.e. ChangeText)
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        if ( !IsMultiLine() )
+            m_qtLineEdit->blockSignals(true);
+        else
+            m_qtTextEdit->blockSignals(true);
+    }
+
+    // Replace the text int the control
+    if ( !IsMultiLine() )
+    {
+        m_qtLineEdit->setText(wxQtConvertString( text ));
+    }
+    else
+    {
+        m_qtTextEdit->setPlainText(wxQtConvertString( text ));
+        // the cursor is moved to the end, ensure it is shown
+        m_qtTextEdit->ensureCursorVisible();
+    }
+
+    // re-enable qt signals
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        if ( !IsMultiLine() )
+            m_qtLineEdit->blockSignals(false);
+        else
+            m_qtTextEdit->blockSignals(false);
+    }
+}
+
+QWidget *wxTextCtrl::GetHandle() const
+{
+    if (m_qtLineEdit!=NULL)
+        return (QWidget *) m_qtLineEdit;
+    else
+        return (QWidget *) m_qtTextEdit;
+}
+
+QScrollArea *wxTextCtrl::QtGetScrollBarsContainer() const
+{
+    if (m_qtTextEdit!=NULL)
+        return (QScrollArea *) m_qtTextEdit;
+    else
+        return NULL;
+}
diff --git a/src/qt/textentry.cpp b/src/qt/textentry.cpp
new file mode 100644
index 0000000000..90537a23b4
--- /dev/null
+++ b/src/qt/textentry.cpp
@@ -0,0 +1,108 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/textentry.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/textentry.h"
+
+wxTextEntry::wxTextEntry()
+{
+}
+
+void wxTextEntry::WriteText(const wxString& WXUNUSED(text))
+{
+}
+
+void wxTextEntry::Remove(long WXUNUSED(from), long WXUNUSED(to))
+{
+}
+
+void wxTextEntry::Copy()
+{
+}
+
+void wxTextEntry::Cut()
+{
+}
+
+void wxTextEntry::Paste()
+{
+}
+
+void wxTextEntry::Undo()
+{
+}
+
+void wxTextEntry::Redo()
+{
+}
+
+bool wxTextEntry::CanUndo() const
+{
+    return false;
+}
+
+bool wxTextEntry::CanRedo() const
+{
+    return false;
+}
+
+void wxTextEntry::SetInsertionPoint(long WXUNUSED(pos))
+{
+}
+
+long wxTextEntry::GetInsertionPoint() const
+{
+    return 0;
+}
+
+long wxTextEntry::GetLastPosition() const
+{
+    return 0;
+}
+
+void wxTextEntry::SetSelection(long WXUNUSED(from), long WXUNUSED(to))
+{
+    wxFAIL_MSG("wxTextEntry::SetSelection should be overriden");
+}
+
+void wxTextEntry::GetSelection(long *from, long *to) const
+{
+    // no unified get selection method in Qt (overriden in textctrl & combobox)
+    // only called if no selection
+    // If the return values from and to are the same, there is no
+    // selection.
+    {
+        *from =
+        *to = GetInsertionPoint();
+    }
+}
+
+bool wxTextEntry::IsEditable() const
+{
+    return false;
+}
+
+void wxTextEntry::SetEditable(bool WXUNUSED(editable))
+{
+}
+
+wxString wxTextEntry::DoGetValue() const
+{
+    return wxString();
+}
+
+void wxTextEntry::DoSetValue(const wxString &WXUNUSED(value), int WXUNUSED(flags))
+{
+}
+
+wxWindow *wxTextEntry::GetEditableWindow()
+{
+    return NULL;
+}
+
diff --git a/src/qt/tglbtn.cpp b/src/qt/tglbtn.cpp
new file mode 100644
index 0000000000..d4cbc11590
--- /dev/null
+++ b/src/qt/tglbtn.cpp
@@ -0,0 +1,142 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/tglbtn.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/tglbtn.h"
+#include "wx/bitmap.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+class wxQtToggleButton : public wxQtEventSignalHandler< QPushButton, wxAnyButton >
+{
+
+public:
+    wxQtToggleButton( wxWindow *parent, wxAnyButton *handler);
+
+private:
+    void clicked( bool checked );
+};
+
+wxQtToggleButton::wxQtToggleButton(wxWindow *parent, wxAnyButton *handler)
+    : wxQtEventSignalHandler< QPushButton, wxAnyButton >( parent, handler )
+{
+    setCheckable( true );
+    connect(this, &QPushButton::clicked, this, &wxQtToggleButton::clicked);
+}
+
+void wxQtToggleButton::clicked( bool checked )
+{
+    wxAnyButton *handler = GetHandler();
+    if ( handler )
+    {
+        // for toggle buttons, send the checked state in the wx event:
+        wxCommandEvent event( wxEVT_TOGGLEBUTTON, handler->GetId() );
+        event.SetInt( checked );
+        EmitEvent( event );
+    }
+}
+
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+
+IMPLEMENT_DYNAMIC_CLASS( wxBitmapToggleButton, wxToggleButtonBase )
+
+wxBitmapToggleButton::wxBitmapToggleButton()
+{
+}
+
+wxBitmapToggleButton::wxBitmapToggleButton(wxWindow *parent,
+               wxWindowID id,
+               const wxBitmap& label,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style,
+               const wxValidator& validator,
+               const wxString& name)
+{
+    Create( parent, id, label, pos, size, style, validator, name );
+}
+
+bool wxBitmapToggleButton::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxBitmap& label,
+            const wxPoint& pos,
+            const wxSize& size, long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    // this button is toggleable and has a bitmap label:
+    QtSetBitmap( label );
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+void wxBitmapToggleButton::SetValue(bool state)
+{
+    m_qtPushButton->setChecked( state );
+}
+
+bool wxBitmapToggleButton::GetValue() const
+{
+    return m_qtPushButton->isChecked();
+}
+
+QPushButton *wxBitmapToggleButton::GetHandle() const
+{
+    return m_qtPushButton;
+}
+
+//##############################################################################
+
+wxToggleButton::wxToggleButton()
+{
+}
+
+wxToggleButton::wxToggleButton(wxWindow *parent,
+               wxWindowID id,
+               const wxString& label,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style,
+               const wxValidator& validator,
+               const wxString& name)
+{
+    Create( parent, id, label, pos, size, style, validator, name );
+}
+
+bool wxToggleButton::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size, long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    // create a checkable push button
+    m_qtPushButton = new wxQtToggleButton( parent, this );
+
+    // this button is toggleable and has a text label
+    SetLabel( wxIsStockID( id ) ? wxGetStockLabel( id ) : label );
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+void wxToggleButton::SetValue(bool state)
+{
+    m_qtPushButton->setChecked( state );
+}
+
+bool wxToggleButton::GetValue() const
+{
+    return m_qtPushButton->isChecked();
+}
+
+QPushButton *wxToggleButton::GetHandle() const
+{
+    return m_qtPushButton;
+}
diff --git a/src/qt/timer.cpp b/src/qt/timer.cpp
new file mode 100644
index 0000000000..3b52a44b02
--- /dev/null
+++ b/src/qt/timer.cpp
@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/timer.cpp
+// Author:      Javier Torres
+// Copyright:   (c) Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TIMER
+
+#include "wx/qt/timer.h"
+#include <QtCore/QTimerEvent>
+
+wxQtTimerImpl::wxQtTimerImpl( wxTimer* timer )
+    : wxTimerImpl( timer )
+{
+    m_timerId = -1;
+}
+
+bool wxQtTimerImpl::Start( int millisecs, bool oneShot )
+{
+    if ( !wxTimerImpl::Start( millisecs, oneShot ) )
+        return false;
+
+    if ( m_timerId >= 0 )
+        return false;
+
+    m_timerId = startTimer( GetInterval() );
+    
+    return m_timerId >= 0;
+}
+
+void wxQtTimerImpl::Stop()
+{
+    killTimer( m_timerId );
+    m_timerId = -1;
+}
+
+bool wxQtTimerImpl::IsRunning() const
+{
+    return m_timerId >= 0;
+}
+
+void wxQtTimerImpl::timerEvent( QTimerEvent * event )
+{
+    if ( event->timerId() == m_timerId )
+    {
+        if ( IsOneShot() )
+        {
+            Stop();
+        }
+        Notify();
+    }
+}
+
+#endif // wxUSE_TIMER
diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp
new file mode 100644
index 0000000000..42b8d1a675
--- /dev/null
+++ b/src/qt/toolbar.cpp
@@ -0,0 +1,352 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/toolbar.cpp
+// Author:      Sean D'Epagnier, Peter Most
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/toolbar.h"
+#include "wx/qt/private/winevent.h"
+#include "wx/qt/private/converter.h"
+
+#if wxUSE_TOOLBAR
+
+#include <QtWidgets/QToolButton>
+
+class wxQtToolButton;
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar, int id, const wxString& label, const wxBitmap& bitmap1,
+                  const wxBitmap& bitmap2, wxItemKind kind, wxObject *clientData,
+                  const wxString& shortHelpString, const wxString& longHelpString)
+        : wxToolBarToolBase(tbar, id, label, bitmap1, bitmap2, kind,
+                            clientData, shortHelpString, longHelpString)
+    {
+        m_qtToolButton = NULL;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)
+    {
+        m_qtToolButton = NULL;
+    }
+
+    virtual void SetLabel( const wxString &label );
+    virtual void SetDropdownMenu(wxMenu* menu);
+
+    void SetIcon();
+    void ClearToolTip();
+    void SetToolTip();
+
+    wxQtToolButton* m_qtToolButton;
+};
+
+class wxQtToolButton : public QToolButton, public wxQtSignalHandler< wxToolBarTool >
+{
+
+public:
+    wxQtToolButton(wxToolBar *parent, wxToolBarTool *handler)
+        : QToolButton(parent->GetHandle()),
+          wxQtSignalHandler< wxToolBarTool >( handler ) {
+        setContextMenuPolicy(Qt::PreventContextMenu);
+    }
+
+private:
+    void mouseReleaseEvent( QMouseEvent *event );
+    void mousePressEvent( QMouseEvent *event );
+    void enterEvent( QEvent *event );
+};
+
+void wxQtToolButton::mouseReleaseEvent( QMouseEvent *event )
+{
+    QToolButton::mouseReleaseEvent(event);
+    if (event->button() == Qt::LeftButton) {
+        wxToolBarTool *handler = GetHandler();
+        wxToolBarBase *toolbar = handler->GetToolBar();
+        toolbar->OnLeftClick( handler->GetId(), isCheckable() ? 1 : 0 );
+    }
+}
+
+void wxQtToolButton::mousePressEvent( QMouseEvent *event )
+{
+    QToolButton::mousePressEvent(event);
+    if (event->button() == Qt::RightButton) {
+        wxToolBarTool *handler = GetHandler();
+        wxToolBarBase *toolbar = handler->GetToolBar();
+        toolbar->OnRightClick( handler->GetId(), event->x(), event->y() );
+    }
+}
+
+void wxQtToolButton::enterEvent( QEvent *WXUNUSED(event) )
+{
+    wxToolBarTool *handler = GetHandler();
+    wxToolBarBase *toolbar = handler->GetToolBar();
+    toolbar->OnMouseEnter( handler->GetId() );
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+void wxToolBarTool::SetLabel( const wxString &label )
+{
+    wxToolBarToolBase::SetLabel( label );
+
+    if (m_qtToolButton) {
+        m_qtToolButton->setText(wxQtConvertString( label ));
+    }
+}
+
+void wxToolBarTool::SetDropdownMenu(wxMenu* menu)
+{
+    wxToolBarToolBase::SetDropdownMenu(menu);
+    m_qtToolButton->setMenu(menu->GetHandle());
+    menu->SetInvokingWindow(GetToolBar());
+}
+
+void wxToolBarTool::SetIcon()
+{
+    m_qtToolButton->setIcon( QIcon( *GetNormalBitmap().GetHandle() ));
+}
+
+void wxToolBarTool::ClearToolTip()
+{
+    m_qtToolButton->setToolTip("");
+}
+
+void wxToolBarTool::SetToolTip()
+{
+    m_qtToolButton->setToolTip(wxQtConvertString( GetShortHelp() ));
+}
+
+
+class wxQtToolbar : public wxQtEventSignalHandler< QToolBar, wxToolBar >
+{
+public:
+    wxQtToolbar( wxWindow *parent, wxToolBar *handler );
+
+};
+
+wxQtToolbar::wxQtToolbar( wxWindow *parent, wxToolBar *handler )
+    : wxQtEventSignalHandler< QToolBar, wxToolBar >( parent, handler )
+{
+}
+
+
+QToolBar *wxToolBar::GetHandle() const
+{
+    return m_qtToolBar;
+}
+
+void wxToolBar::Init()
+{
+    m_qtToolBar = NULL;
+}
+
+wxToolBar::~wxToolBar()
+{
+}
+
+bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+                       const wxSize& size, long style, const wxString& name)
+{
+    m_qtToolBar = new wxQtToolbar( parent, this );
+    m_qtToolBar->setWindowTitle( wxQtConvertString( name ) );
+
+    SetWindowStyleFlag(style);
+
+    // not calling to wxWindow::Create, so do the rest of initialization:
+    if (parent)
+        parent->AddChild( this );
+
+    PostCreation();
+
+    return wxWindowBase::CreateBase( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
+                                                  wxCoord WXUNUSED(y)) const
+{
+//    actionAt(x, y);
+    wxFAIL_MSG( wxT("wxToolBar::FindToolForPosition() not implemented") );
+    return NULL;
+}
+
+void wxToolBar::SetWindowStyleFlag( long style )
+{
+    wxToolBarBase::SetWindowStyleFlag(style);
+
+    if ( !m_qtToolBar )
+        return;
+
+    m_qtToolBar->setOrientation( IsVertical() ? Qt::Vertical : Qt::Horizontal);
+
+    Qt::ToolButtonStyle buttonStyle = GetButtonStyle();
+
+    // bring the initial state of all the toolbar items in line with the
+    for ( wxToolBarToolsList::const_iterator i = m_tools.begin();
+          i != m_tools.end();         ++i )
+    {
+        wxToolBarTool* tool = static_cast<wxToolBarTool*>(*i);
+        if (!tool->m_qtToolButton)
+            continue;
+
+        tool->m_qtToolButton->setToolButtonStyle(buttonStyle);
+    }
+}
+
+bool wxToolBar::Realize()
+{
+    if ( !wxToolBarBase::Realize() )
+        return false;
+
+    // bring the initial state of all the toolbar items in line with the
+    for ( wxToolBarToolsList::const_iterator i = m_tools.begin();
+          i != m_tools.end();         ++i )
+    {
+        wxToolBarTool* tool = static_cast<wxToolBarTool*>(*i);
+        if (!tool->m_qtToolButton)
+            continue;
+
+        tool->m_qtToolButton->setEnabled(tool->IsEnabled());
+        tool->m_qtToolButton->setChecked(tool->IsToggled());
+
+        if (HasFlag(wxTB_NO_TOOLTIPS))
+            tool->ClearToolTip();
+        else
+            tool->SetToolTip();
+    }
+
+    return true;
+}
+
+QActionGroup* wxToolBar::GetActionGroup(size_t pos)
+{
+    QActionGroup *actionGroup = NULL;
+    if (pos > 0)
+        actionGroup = GetHandle()->actions().at(pos-1)->actionGroup();
+    if (actionGroup == NULL && (int)pos < GetHandle()->actions().size() - 1)
+        actionGroup = GetHandle()->actions().at(pos+1)->actionGroup();
+    if (actionGroup == NULL)
+        actionGroup = new QActionGroup(GetHandle());
+    return actionGroup;
+}
+
+bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+    QAction *before = NULL;
+    if (pos >= 0 && pos < (size_t)GetHandle()->actions().size())
+        before = GetHandle()->actions().at(pos);
+
+    QAction *action;
+    switch ( tool->GetStyle() )
+    {
+        case wxTOOL_STYLE_BUTTON:
+            tool->m_qtToolButton = new wxQtToolButton(this, tool);
+            tool->m_qtToolButton->setToolButtonStyle(GetButtonStyle());
+            tool->SetLabel( tool->GetLabel() );
+
+            if (!HasFlag(wxTB_NOICONS))
+                tool->SetIcon();
+            if (!HasFlag(wxTB_NO_TOOLTIPS))
+                tool->SetToolTip();
+
+            action = GetHandle()->insertWidget(before, tool->m_qtToolButton);
+
+            switch (tool->GetKind())
+            {
+            default:
+                wxFAIL_MSG("unknown toolbar child type");
+                // fall through
+            case wxITEM_RADIO:
+                GetActionGroup(pos)->addAction(action);
+                // fall-through
+            case wxITEM_CHECK:
+                tool->m_qtToolButton->setCheckable(true);
+            case wxITEM_DROPDOWN:
+            case wxITEM_NORMAL:
+                break;
+            }
+            break;
+
+        case wxTOOL_STYLE_SEPARATOR:
+            if (tool->IsStretchable()) {
+                QWidget* spacer = new QWidget();
+                spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                GetHandle()->insertWidget(before, spacer);
+            } else
+                GetHandle()->insertSeparator(before);
+            break;
+
+        case wxTOOL_STYLE_CONTROL:
+            wxWindow* control = tool->GetControl();
+            GetHandle()->insertWidget(before, control->GetHandle());
+            break;
+    }
+
+    InvalidateBestSize();
+
+    return true;
+}
+
+bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase *toolBase)
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+    delete tool->m_qtToolButton;
+    tool->m_qtToolButton = NULL;
+
+    InvalidateBestSize();
+    return true;
+}
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+    tool->m_qtToolButton->setEnabled(enable);
+}
+
+void wxToolBar::DoToggleTool(wxToolBarToolBase *toolBase, bool toggle)
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+    tool->m_qtToolButton->setChecked(toggle);
+}
+
+void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
+                            bool WXUNUSED(toggle))
+{
+    // VZ: absolutely no idea about how to do it
+    wxFAIL_MSG( wxT("not implemented") );
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id, const wxString& label, const wxBitmap& bmpNormal,
+                                      const wxBitmap& bmpDisabled, wxItemKind kind, wxObject *clientData,
+                                      const wxString& shortHelp, const wxString& longHelp)
+{
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control,
+                                          const wxString& label)
+{
+    return new wxToolBarTool(this, control, label);
+}
+
+Qt::ToolButtonStyle wxToolBar::GetButtonStyle()
+{
+    if (!HasFlag(wxTB_NOICONS)) {
+        if (HasFlag(wxTB_HORZ_LAYOUT))
+            return Qt::ToolButtonTextBesideIcon;
+        else if (HasFlag(wxTB_TEXT))
+            return Qt::ToolButtonTextUnderIcon;
+        else
+            return Qt::ToolButtonIconOnly;
+    }
+    return Qt::ToolButtonTextOnly;
+}
+
+#endif // wxUSE_TOOLBAR
+
diff --git a/src/qt/tooltip.cpp b/src/qt/tooltip.cpp
new file mode 100644
index 0000000000..409035a2f7
--- /dev/null
+++ b/src/qt/tooltip.cpp
@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/tooltip.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/tooltip.h"
+#include "wx/qt/private/utils.h"
+
+/* static */ void wxToolTip::Enable(bool WXUNUSED(flag))
+{
+    wxMISSING_FUNCTION();
+}
+
+/* static */ void wxToolTip::SetDelay(long WXUNUSED(milliseconds))
+{
+    wxMISSING_FUNCTION();
+}
+
+/* static */ void wxToolTip::SetAutoPop(long WXUNUSED(milliseconds))
+{
+    wxMISSING_FUNCTION();
+}
+
+/* static */ void wxToolTip::SetReshow(long WXUNUSED(milliseconds))
+{
+    wxMISSING_FUNCTION();
+}
+
+
+
+wxToolTip::wxToolTip(const wxString &tip)
+{
+    SetTip( tip );
+}
+
+void wxToolTip::SetTip(const wxString& tip)
+{
+    m_text = tip;
+}
+
+const wxString &wxToolTip::GetTip() const
+{
+    return m_text;
+}
+
+
+void wxToolTip::SetWindow(wxWindow *win)
+{
+    m_window = win;
+    wxMISSING_FUNCTION();
+}
diff --git a/src/qt/toplevel.cpp b/src/qt/toplevel.cpp
new file mode 100644
index 0000000000..c23019c64d
--- /dev/null
+++ b/src/qt/toplevel.cpp
@@ -0,0 +1,200 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/toplevel.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/toplevel.h"
+#include "wx/qt/private/converter.h"
+#include <QtGui/QIcon>
+
+wxTopLevelWindowQt::wxTopLevelWindowQt()
+{
+}
+
+wxTopLevelWindowQt::wxTopLevelWindowQt(wxWindow *parent,
+           wxWindowID winId,
+           const wxString &title,
+           const wxPoint &pos,
+           const wxSize &size,
+           long style,
+           const wxString &name )
+{
+    Create( parent, winId, title, pos, size, style, name );
+}
+
+bool wxTopLevelWindowQt::Create( wxWindow *parent, wxWindowID winId,
+    const wxString &title, const wxPoint &pos, const wxSize &sizeOrig,
+    long style, const wxString &name )
+{
+    wxSize size(sizeOrig);
+    if ( !size.IsFullySpecified() )
+        size.SetDefaults( GetDefaultSize() );
+
+    wxTopLevelWindows.Append( this );
+
+    if (!CreateBase( parent, winId, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxTopLevelWindowNative creation failed") );
+        return false;
+    }
+
+    SetTitle( title );
+    SetWindowStyleFlag( style );
+
+    if (pos != wxDefaultPosition)
+        m_qtWindow->move( pos.x, pos.y );
+
+    m_qtWindow->resize( wxQtConvertSize( size ) );
+
+    // Prevent automatic deletion of Qt main window on close
+    // (this should be the default, but left just fo enforce it)
+    GetHandle()->setAttribute(Qt::WA_DeleteOnClose, false);
+
+    // not calling to wxWindow::Create, so do the rest of initialization:
+    if (parent) parent->AddChild( this );
+
+    return true;
+}
+
+void wxTopLevelWindowQt::Maximize(bool WXUNUSED(maximize)) 
+{
+}
+
+void wxTopLevelWindowQt::Restore()
+{
+}
+
+void wxTopLevelWindowQt::Iconize(bool WXUNUSED(iconize) )
+{
+}
+
+bool wxTopLevelWindowQt::IsMaximized() const
+{
+    return false;
+}
+
+bool wxTopLevelWindowQt::IsIconized() const
+{
+    return false;
+}
+
+
+bool wxTopLevelWindowQt::ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style))
+{
+    return false;
+}
+
+bool wxTopLevelWindowQt::IsFullScreen() const
+{
+    return false;
+}
+
+void wxTopLevelWindowQt::SetTitle(const wxString& title)
+{
+    GetHandle()->setWindowTitle( wxQtConvertString( title ));
+}
+
+wxString wxTopLevelWindowQt::GetTitle() const
+{
+    return ( wxQtConvertString( GetHandle()->windowTitle() ));
+}
+
+void wxTopLevelWindowQt::SetIcons( const wxIconBundle& icons )
+{
+    wxTopLevelWindowBase::SetIcons( icons );
+    
+    QIcon qtIcons;
+    for ( size_t i = 0; i < icons.GetIconCount(); i++ )
+    {
+        qtIcons.addPixmap( *icons.GetIconByIndex( i ).GetHandle() );
+    }
+    GetHandle()->setWindowIcon( qtIcons );
+}
+
+void wxTopLevelWindowQt::SetWindowStyleFlag( long style )
+{
+    wxWindow::SetWindowStyleFlag( style );
+    
+    Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
+    
+    if ( HasFlag( wxSTAY_ON_TOP ) != qtFlags.testFlag( Qt::WindowStaysOnTopHint ) )
+        qtFlags ^= Qt::WindowStaysOnTopHint;
+
+    if ( HasFlag( wxCAPTION ) )
+    {
+        // Only show buttons if window has caption
+        if ( HasFlag( wxSYSTEM_MENU ) )
+        {
+            qtFlags |= Qt::WindowSystemMenuHint;
+            if ( HasFlag( wxMINIMIZE_BOX ) )
+                qtFlags |= Qt::WindowMinimizeButtonHint;
+            else
+                qtFlags &= ~Qt::WindowMinimizeButtonHint;
+            
+            if ( HasFlag( wxMAXIMIZE_BOX ) )
+                qtFlags |= Qt::WindowMaximizeButtonHint;
+            else
+                qtFlags &= ~Qt::WindowMaximizeButtonHint;
+            
+            if ( HasFlag( wxCLOSE_BOX ) )
+                qtFlags |= Qt::WindowCloseButtonHint;
+            else
+                qtFlags &= ~Qt::WindowCloseButtonHint;
+        }
+        else
+        {
+            qtFlags &= ~Qt::WindowSystemMenuHint;
+            qtFlags &= ~Qt::WindowMinMaxButtonsHint;
+            qtFlags &= ~Qt::WindowCloseButtonHint;
+        }
+    }
+        
+    GetHandle()->setWindowFlags( qtFlags );
+    
+    wxCHECK_RET( !( HasFlag( wxMAXIMIZE ) && HasFlag( wxMAXIMIZE ) ), "Window cannot be both maximized and minimized" );
+    if ( HasFlag( wxMAXIMIZE ) )
+        GetHandle()->setWindowState( Qt::WindowMaximized );
+    else if ( HasFlag( wxMINIMIZE ) )
+        GetHandle()->setWindowState( Qt::WindowMinimized );
+    
+    if ( HasFlag( wxRESIZE_BORDER ) )
+        GetHandle()->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
+    else
+        GetHandle()->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+    
+    if ( HasFlag( wxCENTRE ) )
+    {
+        Centre();
+    }
+}
+
+long wxTopLevelWindowQt::GetWindowStyleFlag() const
+{
+    // Update maximized/minimized state
+    long winStyle = wxWindow::GetWindowStyleFlag();
+
+    if (GetHandle())
+    {
+        switch ( GetHandle()->windowState() )
+        {
+        case Qt::WindowMaximized:
+            winStyle &= ~wxMINIMIZE;
+            winStyle |= wxMAXIMIZE;
+            break;
+        case Qt::WindowMinimized:
+            winStyle &= ~wxMAXIMIZE;
+            winStyle |= wxMINIMIZE;
+            break;
+        default:
+            winStyle &= ~wxMINIMIZE;
+            winStyle &= ~wxMAXIMIZE;
+        }
+    }
+
+    return winStyle;
+}
diff --git a/src/qt/treectrl.cpp b/src/qt/treectrl.cpp
new file mode 100644
index 0000000000..2362c6d99d
--- /dev/null
+++ b/src/qt/treectrl.cpp
@@ -0,0 +1,354 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/treectrl.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/treectrl.h"
+
+wxTreeCtrl::wxTreeCtrl()
+{
+}
+
+wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    Create( parent, id, pos, size, style, validator, name );
+}
+
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    m_qtTreeWidget = new QTreeWidget( parent->GetHandle() );
+
+    return QtCreateControl( parent, id, pos, size, style, validator, name );
+}
+
+unsigned wxTreeCtrl::GetCount() const
+{
+    return 0;
+}
+
+
+unsigned wxTreeCtrl::GetIndent() const
+{
+    return m_qtTreeWidget->columnCount();
+}
+
+void wxTreeCtrl::SetIndent(unsigned int indent)
+{
+    m_qtTreeWidget->setColumnCount( indent );
+}
+
+void wxTreeCtrl::SetImageList(wxImageList *imageList)
+{
+}
+
+void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
+{
+}
+
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
+{
+    return wxString();
+}
+
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
+                 wxTreeItemIcon which) const
+{
+    return 0;
+}
+
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
+{
+    return NULL;
+}
+
+wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
+{
+    return wxColour();
+}
+
+wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
+{
+    return wxColour();
+}
+
+wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
+{
+    return wxFont();
+}
+
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
+{
+}
+
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item,
+                          int image,
+                          wxTreeItemIcon which)
+{
+}
+
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
+{
+}
+
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
+{
+}
+
+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
+{
+}
+
+void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight)
+{
+}
+
+void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, const wxColour& col)
+{
+}
+
+void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col)
+{
+}
+
+void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
+{
+}
+
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
+{
+    return false;
+}
+
+bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
+{
+    return false;
+}
+
+bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
+{
+    return false;
+}
+
+bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
+{
+    return false;
+}
+
+bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
+{
+    return false;
+}
+
+size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) const
+{
+    return 0;
+}
+
+wxTreeItemId wxTreeCtrl::GetRootItem() const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetSelection() const
+{
+    return wxTreeItemId();
+}
+
+size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
+{
+    return 0;
+}
+
+void wxTreeCtrl::SetFocusedItem(const wxTreeItemId& item)
+{
+
+}
+
+void wxTreeCtrl::ClearFocusedItem()
+{
+
+}
+
+wxTreeItemId wxTreeCtrl::GetFocusedItem() const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+                             int image, int selImage,
+                             wxTreeItemData *data)
+{
+    return wxTreeItemId();
+}
+
+void wxTreeCtrl::Delete(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::DeleteAllItems()
+{
+}
+
+void wxTreeCtrl::Expand(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::Collapse(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::Toggle(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::Unselect()
+{
+}
+
+void wxTreeCtrl::UnselectAll()
+{
+}
+
+void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
+{
+}
+
+void wxTreeCtrl::SelectChildren(const wxTreeItemId& parent)
+{
+}
+
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
+{
+}
+
+void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)
+{
+}
+
+wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item, wxClassInfo* textCtrlClass)
+{
+    return NULL;
+}
+
+wxTextCtrl *wxTreeCtrl::GetEditControl() const
+{
+    return NULL;
+}
+
+void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)
+{
+}
+
+void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
+{
+}
+
+bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly) const
+{
+    return false;
+}
+
+int wxTreeCtrl::DoGetItemState(const wxTreeItemId& item) const
+{
+    return 0;
+}
+
+void wxTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
+{
+}
+
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
+                                  size_t pos,
+                                  const wxString& text,
+                                  int image, int selImage,
+                                  wxTreeItemData *data)
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
+                                   const wxTreeItemId& idPrevious,
+                                   const wxString& text,
+                                   int image, int selImage,
+                                   wxTreeItemData *data)
+{
+    return wxTreeItemId();
+}
+
+wxTreeItemId wxTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags) const
+{
+    return wxTreeItemId();
+}
+
+QTreeWidget *wxTreeCtrl::GetHandle() const
+{
+    return m_qtTreeWidget;
+}
diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp
new file mode 100644
index 0000000000..b37d946b40
--- /dev/null
+++ b/src/qt/uiaction.cpp
@@ -0,0 +1,111 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/uiaction.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/qt/defs.h"
+#include "wx/qt/private/utils.h"
+#include "wx/uiaction.h"
+#include "wx/qt/private/converter.h"
+
+#include <QtTest/QtTestGui>
+
+#if wxUSE_UIACTIONSIMULATOR
+
+using namespace Qt;
+using namespace QTest;
+
+static MouseButton ConvertMouseButton( int button )
+{
+    MouseButton qtButton;
+
+    switch ( button )
+    {
+        case wxMOUSE_BTN_LEFT:
+            qtButton = LeftButton;
+            break;
+
+        case wxMOUSE_BTN_MIDDLE:
+            qtButton = MiddleButton;
+            break;
+
+        case wxMOUSE_BTN_RIGHT:
+            qtButton = RightButton;
+            break;
+
+        case wxMOUSE_BTN_AUX1:
+            qtButton = XButton1;
+            break;
+
+        case wxMOUSE_BTN_AUX2:
+            qtButton = XButton2;
+            break;
+
+        default:
+            wxFAIL_MSG( "Unsupported mouse button" );
+            qtButton = NoButton;
+            break;
+    }
+    return qtButton;
+}
+
+
+static bool SimulateMouseButton( MouseAction mouseAction, MouseButton mouseButton )
+{
+    QPoint mousePosition = QCursor::pos();
+    QWidget *widget = QApplication::widgetAt( mousePosition );
+    if ( widget != NULL )
+        mouseEvent( mouseAction, widget, mouseButton, NoModifier, mousePosition );
+
+    // If we found a widget then we successfully simulated an event:
+
+    return widget != NULL;
+}
+
+static bool SimulateKeyboardKey( KeyAction keyAction, Key key )
+{
+    QWidget *widget = QApplication::focusWidget();
+    if ( widget != NULL )
+        keyEvent( keyAction, widget, key );
+
+    // If we found a widget then we successfully simulated an event:
+
+    return widget != NULL;
+}
+
+bool wxUIActionSimulator::MouseDown( int button )
+{
+    return SimulateMouseButton( MousePress, ConvertMouseButton( button ));
+}
+
+bool wxUIActionSimulator::MouseUp(int button)
+{
+    return SimulateMouseButton( MouseRelease, ConvertMouseButton( button ));
+}
+
+bool wxUIActionSimulator::MouseMove(long x, long y)
+{
+    QCursor::setPos( x, y );
+
+    return true;
+}
+
+bool wxUIActionSimulator::DoKey(int keyCode, int modifiers, bool isDown)
+{
+    Qt::KeyboardModifiers qtmodifiers;
+    enum Key key;
+
+    key = (enum Key) wxQtConvertKeyCode( keyCode, modifiers, qtmodifiers );
+
+    wxCHECK_MSG(key, false, wxT("No current key conversion equivalent in Qt"));
+    KeyAction keyAction = isDown ? Press : Release;
+    return SimulateKeyboardKey( keyAction, key );
+}
+
+#endif // wxUSE_UIACTIONSIMULATOR
+
diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp
new file mode 100644
index 0000000000..3d599d3b56
--- /dev/null
+++ b/src/qt/utils.cpp
@@ -0,0 +1,172 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/utils.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/utils.h"
+#include "wx/window.h"
+#include "wx/cursor.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+
+#include <QtGui/QCursor>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtGui/QDesktopServices>
+#include <QtCore/QUrl>
+
+void wxMissingImplementation( const char fileName[], unsigned lineNumber,
+    const char feature[] )
+{
+    // Make it look similar to the assert messages:
+
+    fprintf( stderr, "%s(%d): Missing implementation of \"%s\"\n", fileName, lineNumber, feature );
+}
+
+void wxQtFillMouseButtons( Qt::MouseButtons buttons, wxMouseState *state )
+{
+    state->SetLeftDown( buttons.testFlag( Qt::LeftButton ) );
+    state->SetRightDown( buttons.testFlag( Qt::RightButton ) );
+    state->SetMiddleDown( buttons.testFlag( Qt::MidButton ) );
+    state->SetAux1Down( buttons.testFlag( Qt::XButton1 ) );
+    state->SetAux2Down( buttons.testFlag( Qt::XButton2 ) );
+}
+
+#if wxUSE_GUI
+wxPoint wxGetMousePosition()
+{
+    return wxQtConvertPoint( QCursor::pos() );
+}
+
+void wxGetMousePosition( int *x, int *y )
+{
+    wxPoint position = wxGetMousePosition();
+
+    *x = position.x;
+    *y = position.y;
+}
+#endif
+
+#if wxUSE_GUI
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    wxQtFillMouseButtons( QApplication::mouseButtons(), &ms );
+
+    return ms;
+}
+#endif
+
+
+wxWindow *wxFindWindowAtPoint(const wxPoint& pt)
+{
+    /* Another option is to use QApplication::topLevelAt()
+     * but that gives the QWidget so the wxWindow list must
+     * be traversed comparing with this, or use the pointer from
+     * a wxQtWidget/wxQtFrame to the window, but they have
+     * no standard interface to return that. */
+    return wxGenericFindWindowAtPoint( pt );
+}
+
+wxWindow *wxFindWindowAtPointer(wxPoint& pt)
+{
+    pt = wxQtConvertPoint( QCursor::pos() );
+    
+    return wxFindWindowAtPoint( pt );
+}
+
+bool wxGetKeyState(wxKeyCode key)
+{
+    /* FIXME: Qt doesn't provide a method to check the state of keys others
+     * than modifiers (shift, control, alt, meta). A platform-specific method
+     * is needed, probably one per platform Qt runs on. */
+    switch ( key )
+    {
+        case WXK_CONTROL:
+            return QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
+        case WXK_SHIFT:
+            return QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier);
+        case WXK_ALT:
+            return QApplication::keyboardModifiers().testFlag(Qt::AltModifier);
+        case WXK_WINDOWS_LEFT:
+            return QApplication::keyboardModifiers().testFlag(Qt::MetaModifier);
+        default:
+            wxMISSING_IMPLEMENTATION( "wxGetKeyState for non-modifiers keys" );
+            return false;
+    }
+}
+
+int wxDisplayDepth()
+{
+    return QApplication::desktop()->depth();
+}
+
+void wxDisplaySize(int *width, int *height)
+{
+    if ( width != NULL )
+        *width = QApplication::desktop()->width();
+    if ( height != NULL )
+        *height = QApplication::desktop()->height();
+}
+
+void wxDisplaySizeMM(int *width, int *height)
+{
+    if ( width != NULL )
+        *width = QApplication::desktop()->widthMM();
+    if ( height != NULL )
+        *height = QApplication::desktop()->heightMM();
+}
+
+void wxBell()
+{
+    QApplication::beep();
+}
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    QRect r = QApplication::desktop()->availableGeometry();
+
+    *x = r.x();
+    *y = r.y();
+    *width = r.width();
+    *height = r.height();
+}
+
+wxWindow *wxGetActiveWindow()
+{
+    QWidget *w = QApplication::activeWindow();
+
+    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        if ( win->GetHandle() == w )
+            return win;
+        
+        node = node->GetPrevious();
+    }
+
+    return NULL;
+}
+
+bool wxColourDisplay()
+{
+    return QApplication::desktop()->depth() > 1;
+}
+
+bool wxLaunchDefaultApplication(const wxString& path, int WXUNUSED( flags ) )
+{
+    return QDesktopServices::openUrl( QUrl::fromLocalFile( wxQtConvertString( path ) ) );
+}
+
+// Generic "Slot" to conect destruction signal for debugging purposes:
+void wxQtHandleDestroyedSignal(QObject *qobj)
+{
+   wxLogDebug( wxT("%s was destroyed by Qt. pointer=%p"),
+               QObject::staticMetaObject.className(), qobj );
+}
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
new file mode 100644
index 0000000000..cc03c85c51
--- /dev/null
+++ b/src/qt/window.cpp
@@ -0,0 +1,1417 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/window.cpp
+// Author:      Peter Most, Javier Torres, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/window.h"
+#include "wx/log.h"
+#include "wx/menu.h"
+#include "wx/tooltip.h"
+#include "wx/scrolbar.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+#include <QtGui/QPicture>
+#include <QtGui/QPainter>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QScrollArea>
+
+
+#define VERT_SCROLLBAR_POSITION 0, 1
+#define HORZ_SCROLLBAR_POSITION 1, 0
+
+// Base Widget helper (no scrollbar, used by wxWindow)
+
+class wxQtWidget : public wxQtEventSignalHandler< QWidget, wxWindowQt >
+{
+    public:
+        wxQtWidget( wxWindowQt *parent, wxWindowQt *handler );
+};
+
+wxQtWidget::wxQtWidget( wxWindowQt *parent, wxWindowQt *handler )
+    : wxQtEventSignalHandler< QWidget, wxWindowQt >( parent, handler )
+{
+}
+
+// Scroll Area helper (container to show scroll bars for wxScrolledWindow):
+
+class wxQtScrollArea : public wxQtEventSignalHandler< QScrollArea, wxWindowQt >
+{
+
+    public:
+        wxQtScrollArea( wxWindowQt *parent, wxWindowQt *handler );
+};
+
+wxQtScrollArea::wxQtScrollArea( wxWindowQt *parent, wxWindowQt *handler )
+    : wxQtEventSignalHandler< QScrollArea, wxWindowQt >( parent, handler )
+{
+}
+
+#if wxUSE_ACCEL || defined( Q_MOC_RUN )
+class wxQtShortcutHandler : public QObject, public wxQtSignalHandler< wxWindowQt >
+{
+
+public:
+    wxQtShortcutHandler( wxWindowQt *window );
+
+public:
+    void activated();
+};
+
+wxQtShortcutHandler::wxQtShortcutHandler( wxWindowQt *window )
+    : wxQtSignalHandler< wxWindowQt >( window )
+{
+}
+
+void wxQtShortcutHandler::activated()
+{
+    int command = sender()->property("wxQt_Command").toInt();
+
+    GetHandler()->QtHandleShortcut( command );
+}
+#endif // wxUSE_ACCEL
+
+//##############################################################################
+
+wxBEGIN_EVENT_TABLE( wxWindow, wxWindowBase )
+wxEND_EVENT_TABLE()
+
+
+// We use the QObject property capabilities to store the wxWindow pointer, so we
+// don't need to use a separate lookup table. We also want to use it in the proper
+// way and not use/store store void pointers e.g.:
+// qVariantSetValue( variant, static_cast< void * >( window ));
+// static_cast< wxWindow * >( qVariantValue< void * >( variant ));
+// so we declare the corresponding Qt meta type:
+
+Q_DECLARE_METATYPE( const wxWindow * )
+
+static const char WINDOW_POINTER_PROPERTY_NAME[] = "wxWindowPointer";
+
+// We accept a 'const wxWindow *' to indicate that the pointer is only stored:
+
+/* static */ void wxWindowQt::QtStoreWindowPointer( QWidget *widget, const wxWindowQt *window )
+{
+    QVariant variant;
+    qVariantSetValue( variant, window );
+    widget->setProperty( WINDOW_POINTER_PROPERTY_NAME, variant );
+}
+
+/* static */ wxWindowQt *wxWindowQt::QtRetrieveWindowPointer( const QWidget *widget )
+{
+    QVariant variant = widget->property( WINDOW_POINTER_PROPERTY_NAME );
+    return const_cast< wxWindowQt * >( ( variant.value< const wxWindow * >() ));
+}
+
+
+
+
+static wxWindowQt *s_capturedWindow = NULL;
+
+/* static */ wxWindowQt *wxWindowBase::DoFindFocus()
+{
+    wxWindowQt *window = NULL;
+    QWidget *qtWidget = QApplication::focusWidget();
+    if ( qtWidget != NULL )
+        window = wxWindowQt::QtRetrieveWindowPointer( qtWidget );
+
+    return window;
+}
+
+void wxWindowQt::Init()
+{
+    m_horzScrollBar = NULL;
+    m_vertScrollBar = NULL;
+
+    m_qtPicture = new QPicture();
+    m_qtPainter = new QPainter();
+
+    m_mouseInside = false;
+
+#if wxUSE_ACCEL
+    m_qtShortcutHandler = new wxQtShortcutHandler( this );
+    m_processingShortcut = false;
+#endif
+    m_qtWindow = NULL;
+    m_qtContainer = NULL;
+}
+
+wxWindowQt::wxWindowQt()
+{
+    Init();
+
+}
+
+
+wxWindowQt::wxWindowQt(wxWindowQt *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+    long style, const wxString& name)
+{
+    Init();
+
+    Create( parent, id, pos, size, style, name );
+}
+
+
+wxWindowQt::~wxWindowQt()
+{
+    SendDestroyEvent();
+
+    if ( s_capturedWindow == this )
+        s_capturedWindow = NULL;
+
+    DestroyChildren(); // This also destroys scrollbars
+
+    delete m_qtPicture;
+    delete m_qtPainter;
+
+#if wxUSE_ACCEL
+    m_qtShortcutHandler->deleteLater();
+#endif
+
+    // Delete only if the qt widget was created or assigned to this base class
+    if (m_qtWindow)
+    {
+        wxLogDebug(wxT("wxWindow::~wxWindow %s m_qtWindow=%p"),
+                   (const char*)GetName(), m_qtWindow);
+        // Avoid sending further signals (i.e. if deleting the current page)
+        m_qtWindow->blockSignals(true);
+        // Reset the pointer to avoid handling pending event and signals
+        QtStoreWindowPointer( GetHandle(), NULL );
+        // Delete QWidget when control return to event loop (safer)
+        m_qtWindow->deleteLater();
+        m_qtWindow = NULL;
+    }
+    else
+    {
+        wxLogDebug(wxT("wxWindow::~wxWindow %s m_qtWindow is NULL"),
+                   (const char*)GetName());
+    }
+}
+
+
+bool wxWindowQt::Create( wxWindowQt * parent, wxWindowID id, const wxPoint & pos,
+        const wxSize & size, long style, const wxString &name )
+{
+    // If the underlying control hasn't been created then this most probably means
+    // that a generic control, like wxPanel, is being created, so we need a very
+    // simple control as a base:
+
+    if ( GetHandle() == NULL )
+    {
+        if ( style & (wxHSCROLL | wxVSCROLL) )
+        {
+            m_qtContainer = new wxQtScrollArea( parent, this );
+            m_qtWindow = m_qtContainer;
+            // Create the scroll bars if needed:
+            if ( style & wxHSCROLL )
+                QtSetScrollBar( wxHORIZONTAL );
+            if ( style & wxVSCROLL )
+                QtSetScrollBar( wxVERTICAL );
+        }
+        else
+        {
+            m_qtWindow = new wxQtWidget( parent, this );
+        }
+    }
+
+    if ( !wxWindowBase::CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+        return false;
+
+    parent->AddChild( this );
+
+    DoMoveWindow( pos.x, pos.y, size.GetWidth(), size.GetHeight() );
+
+    PostCreation();
+
+    return ( true );
+}
+
+void wxWindowQt::PostCreation(bool generic)
+{
+    if ( m_qtWindow == NULL )
+    {
+        // store pointer to the QWidget subclass (to be used in the destructor)
+        m_qtWindow = GetHandle();
+    }
+    wxLogDebug(wxT("wxWindow::Create %s m_qtWindow=%p"),
+               (const char*)GetName(), m_qtWindow);
+
+    // set the background style after creation (not before like in wxGTK)
+    // (only for generic controls, to use qt defaults elsewere)
+    if (generic)
+        QtSetBackgroundStyle();
+    else
+        SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+
+//    // Use custom Qt window flags (allow to turn on or off
+//    // the minimize/maximize/close buttons and title bar)
+//    Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
+//
+//    qtFlags |= Qt::CustomizeWindowHint;
+//    qtFlags |= Qt::WindowTitleHint;
+//    qtFlags |= Qt::WindowSystemMenuHint;
+//    qtFlags |= Qt::WindowMinMaxButtonsHint;
+//    qtFlags |= Qt::WindowCloseButtonHint;
+//
+//    GetHandle()->setWindowFlags( qtFlags );
+//
+//    SetWindowStyleFlag( style );
+//
+
+    // Set the default color so Paint Event default handler clears the DC:
+    SetBackgroundColour(wxColour(GetHandle()->palette().background().color()));
+    SetForegroundColour(wxColour(GetHandle()->palette().foreground().color()));
+
+}
+
+void wxWindowQt::AddChild( wxWindowBase *child )
+{
+    // Make sure all children are children of the inner scroll area widget (if any):
+
+    if ( QtGetScrollBarsContainer() )
+        QtReparent( child->GetHandle(), QtGetScrollBarsContainer()->viewport() );
+
+    wxWindowBase::AddChild( child );
+}
+
+bool wxWindowQt::Show( bool show )
+{
+    if ( !wxWindowBase::Show( show ))
+        return false;
+
+    // Show can be called before the underlying window is created:
+
+    QWidget *qtWidget = GetHandle();
+    if ( qtWidget == NULL )
+    {
+        return false;
+    }
+
+    qtWidget->setVisible( show );
+
+    wxSizeEvent event(GetSize(), GetId());
+    event.SetEventObject(this);
+    HandleWindowEvent(event);
+
+    return true;
+}
+
+
+void wxWindowQt::SetLabel(const wxString& label)
+{
+    GetHandle()->setWindowTitle( wxQtConvertString( label ));
+}
+
+
+wxString wxWindowQt::GetLabel() const
+{
+    return ( wxQtConvertString( GetHandle()->windowTitle() ));
+}
+
+void wxWindowQt::DoEnable(bool enable)
+{
+    GetHandle()->setEnabled(enable);
+}
+
+void wxWindowQt::SetFocus()
+{
+    GetHandle()->setFocus();
+}
+
+/* static */ void wxWindowQt::QtReparent( QWidget *child, QWidget *parent )
+{
+    // Backup the attributes which will be changed during the reparenting:
+
+//    QPoint position = child->pos();
+//    bool isVisible = child->isVisible();
+    Qt::WindowFlags windowFlags = child->windowFlags();
+
+    child->setParent( parent );
+
+    // Restore the attributes:
+
+    child->setWindowFlags( windowFlags );
+//    child->move( position );
+//    child->setVisible( isVisible );
+}
+
+bool wxWindowQt::Reparent( wxWindowBase *parent )
+{
+    if ( !wxWindowBase::Reparent( parent ))
+        return false;
+
+    QtReparent( GetHandle(), parent->GetHandle() );
+
+    return true;
+}
+
+
+void wxWindowQt::Raise()
+{
+    GetHandle()->raise();
+}
+
+void wxWindowQt::Lower()
+{
+    GetHandle()->lower();
+}
+
+
+void wxWindowQt::WarpPointer(int x, int y)
+{
+    // QCursor::setPos takes global screen coordinates, so translate it:
+
+    ClientToScreen( &x, &y );
+    QCursor::setPos( x, y );
+}
+
+void wxWindowQt::Update()
+{
+    wxLogDebug(wxT("wxWindow::Update %s"), (const char*)GetName());
+    // send the paint event to the inner widget in scroll areas:
+    if ( QtGetScrollBarsContainer() )
+    {
+        QtGetScrollBarsContainer()->viewport()->update();
+    } else {
+        GetHandle()->update();
+    }
+}
+
+void wxWindowQt::Refresh( bool WXUNUSED( eraseBackground ), const wxRect *rect )
+{
+    QWidget *widget;
+
+    // get the inner widget in scroll areas:
+    if ( QtGetScrollBarsContainer() )
+    {
+        widget = QtGetScrollBarsContainer()->viewport();
+    } else {
+        widget = GetHandle();
+    }
+
+    if ( widget != NULL )
+    {
+        if ( rect != NULL )
+        {
+            wxLogDebug(wxT("wxWindow::Refresh %s rect %d %d %d %d"),
+                       (const char*)GetName(),
+                       rect->x, rect->y, rect->width, rect->height);
+            widget->update( wxQtConvertRect( *rect ));
+        }
+        else
+        {
+            wxLogDebug(wxT("wxWindow::Refresh %s"),
+                       (const char*)GetName());
+            widget->update();
+        }
+    }
+}
+
+    
+bool wxWindowQt::SetFont( const wxFont &font )
+{
+    GetHandle()->setFont( font.GetHandle() );
+    
+    return ( true );
+}
+
+
+int wxWindowQt::GetCharHeight() const
+{
+    return ( GetHandle()->fontMetrics().height() );
+}
+
+
+int wxWindowQt::GetCharWidth() const
+{
+    return ( GetHandle()->fontMetrics().averageCharWidth() );
+}
+
+void wxWindowQt::DoGetTextExtent(const wxString& string, int *x, int *y, int *descent,
+        int *externalLeading, const wxFont *font ) const
+{
+    QFontMetrics fontMetrics( font != NULL ? font->GetHandle() : GetHandle()->font() );
+
+    if ( x != NULL )
+        *x = fontMetrics.width( wxQtConvertString( string ));
+
+    if ( y != NULL )
+        *y = fontMetrics.height();
+
+    if ( descent != NULL )
+        *descent = fontMetrics.descent();
+
+    if ( externalLeading != NULL )
+        *externalLeading = fontMetrics.lineSpacing();
+}
+
+/* Returns a scrollbar for the given orientation, or NULL if the scrollbar
+ * has not been previously created and create is false */
+wxScrollBar *wxWindowQt::QtGetScrollBar( int orientation ) const
+{
+    wxCHECK_MSG( CanScroll( orientation ), NULL, "Window can't scroll in that orientation" );
+
+    wxScrollBar *scrollBar = NULL;
+
+    if ( orientation == wxHORIZONTAL )
+        scrollBar = m_horzScrollBar;
+    else
+        scrollBar = m_vertScrollBar;
+
+    return scrollBar;
+}
+
+/* Returns a new scrollbar for the given orientation, or set the scrollbar
+ * passed as parameter */
+wxScrollBar *wxWindowQt::QtSetScrollBar( int orientation, wxScrollBar *scrollBar )
+{
+    QAbstractScrollArea *scrollArea = QtGetScrollBarsContainer();
+    wxCHECK_MSG( scrollArea, NULL, "Window without scrolling area" );
+
+    // Create a new scrollbar if needed
+    if ( !scrollBar )
+    {
+        scrollBar = new wxScrollBar( const_cast< wxWindowQt* >( this ), wxID_ANY,
+                                     wxDefaultPosition, wxDefaultSize,
+                                     orientation == wxHORIZONTAL ? wxSB_HORIZONTAL : wxSB_VERTICAL);
+
+        // Connect scrollbar events to this window
+        scrollBar->Bind( wxEVT_SCROLL_LINEUP, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_LINEDOWN, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_PAGEUP, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_PAGEDOWN, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_TOP, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_BOTTOM, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_THUMBTRACK, &wxWindowQt::QtOnScrollBarEvent, this );
+        scrollBar->Bind( wxEVT_SCROLL_THUMBRELEASE, &wxWindowQt::QtOnScrollBarEvent, this );
+    }
+
+    // Let Qt handle layout
+    if ( orientation == wxHORIZONTAL )
+    {
+        scrollArea->setHorizontalScrollBar( scrollBar->GetHandle() );
+        m_horzScrollBar = scrollBar;
+    }
+    else
+    {
+        scrollArea->setVerticalScrollBar( scrollBar->GetHandle() );
+        m_vertScrollBar = scrollBar;
+    }
+    return scrollBar;
+}
+
+
+void wxWindowQt::SetScrollbar( int orientation, int pos, int thumbvisible, int range, bool refresh )
+{
+    wxCHECK_RET( CanScroll( orientation ), "Window can't scroll in that orientation" );
+
+    //If not exist, create the scrollbar
+    wxScrollBar *scrollBar = QtGetScrollBar( orientation );
+    if ( scrollBar == NULL )
+        scrollBar = QtSetScrollBar( orientation );
+
+    // Configure the scrollbar if it exists. If range is zero we can get here with
+    // scrollBar == NULL and it is not a problem
+    if ( scrollBar )
+    {
+        scrollBar->SetScrollbar( pos, thumbvisible, range, thumbvisible, refresh );
+        if ( HasFlag( wxALWAYS_SHOW_SB ) && ( range == 0 ) )
+        {
+            // Disable instead of hide
+            scrollBar->GetHandle()->show();
+            scrollBar->GetHandle()->setEnabled( false );
+        }
+        else
+            scrollBar->GetHandle()->setEnabled( true );            
+    }
+}
+
+void wxWindowQt::SetScrollPos( int orientation, int pos, bool WXUNUSED( refresh ))
+{
+    wxScrollBar *scrollBar = QtGetScrollBar( orientation );
+    wxCHECK_RET( scrollBar, "Invalid scrollbar" );
+
+    scrollBar->SetThumbPosition( pos );
+}
+
+int wxWindowQt::GetScrollPos( int orientation ) const
+{
+    wxScrollBar *scrollBar = QtGetScrollBar( orientation );
+    wxCHECK_MSG( scrollBar, 0, "Invalid scrollbar" );
+    
+    return scrollBar->GetThumbPosition();
+}
+
+int wxWindowQt::GetScrollThumb( int orientation ) const
+{
+    wxScrollBar *scrollBar = QtGetScrollBar( orientation );
+    wxCHECK_MSG( scrollBar, 0, "Invalid scrollbar" );
+    
+    return scrollBar->GetThumbSize();
+}
+
+int wxWindowQt::GetScrollRange( int orientation ) const
+{
+    wxScrollBar *scrollBar = QtGetScrollBar( orientation );
+    wxCHECK_MSG( scrollBar, 0, "Invalid scrollbar" );
+    
+    return scrollBar->GetRange();
+}
+
+// Handle event from scrollbars
+void wxWindowQt::QtOnScrollBarEvent( wxScrollEvent& event )
+{
+    wxEventType windowEventType = 0;
+
+    // Map the scroll bar event to the corresponding scroll window event:
+
+    wxEventType scrollBarEventType = event.GetEventType();
+    if ( scrollBarEventType == wxEVT_SCROLL_TOP )
+        windowEventType = wxEVT_SCROLLWIN_TOP;
+    else if ( scrollBarEventType == wxEVT_SCROLL_BOTTOM )
+        windowEventType = wxEVT_SCROLLWIN_BOTTOM;
+    else if ( scrollBarEventType == wxEVT_SCROLL_PAGEUP )
+        windowEventType = wxEVT_SCROLLWIN_PAGEUP;
+    else if ( scrollBarEventType == wxEVT_SCROLL_PAGEDOWN )
+        windowEventType = wxEVT_SCROLLWIN_PAGEDOWN;
+    else if ( scrollBarEventType == wxEVT_SCROLL_LINEUP )
+        windowEventType = wxEVT_SCROLLWIN_LINEUP;
+    else if ( scrollBarEventType == wxEVT_SCROLL_LINEDOWN )
+        windowEventType = wxEVT_SCROLLWIN_LINEDOWN;
+    else if ( scrollBarEventType == wxEVT_SCROLL_THUMBTRACK )
+        windowEventType = wxEVT_SCROLLWIN_THUMBTRACK;
+    else if ( scrollBarEventType == wxEVT_SCROLL_THUMBRELEASE )
+        windowEventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+
+    if ( windowEventType != 0 )
+    {
+        wxScrollWinEvent event( windowEventType, event.GetPosition(), event.GetOrientation() );
+        ProcessWindowEvent( event );
+    }
+}
+
+// scroll window to the specified position
+void wxWindowQt::ScrollWindow( int dx, int dy, const wxRect *rect )
+{
+    // check if this is a scroll area (scroll only inner viewport)
+    QWidget *widget;
+    if ( QtGetScrollBarsContainer() )
+        widget = QtGetScrollBarsContainer()->viewport();
+    else
+        widget = GetHandle();
+    // scroll the widget or the specified rect (not children)
+    if ( rect != NULL )
+        widget->scroll( dx, dy, wxQtConvertRect( *rect ));
+    else
+        widget->scroll( dx, dy );
+}
+    
+
+void wxWindowQt::SetDropTarget( wxDropTarget * WXUNUSED( dropTarget ) )
+{
+    wxMISSING_IMPLEMENTATION( __FUNCTION__ );
+}
+
+void wxWindowQt::SetWindowStyleFlag( long style )
+{
+    wxWindowBase::SetWindowStyleFlag( style );
+    
+//    wxMISSING_IMPLEMENTATION( "wxWANTS_CHARS, wxTAB_TRAVERSAL" );
+//    // wxFULL_REPAINT_ON_RESIZE: Qt::WResizeNoErase (marked obsolete)
+//    // wxTRANSPARENT_WINDOW, wxCLIP_CHILDREN: Used in window for
+//    //   performance, apparently not needed.
+//
+//    // wxWANTS_CHARS: Need to reimplement event()
+//    //   See: http://doc.qt.nokia.com/latest/qwidget.html#events
+//    // wxTAB_TRAVERSAL: reimplement focusNextPrevChild()
+//
+//    Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
+//
+//    // For this to work Qt::CustomizeWindowHint must be set (done in Create())
+//    if ( HasFlag( wxCAPTION ) )
+//    {
+//        // Enable caption bar and all buttons. This behavious
+//        // is overwritten by subclasses (wxTopLevelWindow).
+//        qtFlags |= Qt::WindowTitleHint;
+//        qtFlags |= Qt::WindowSystemMenuHint;
+//        qtFlags |= Qt::WindowMinMaxButtonsHint;
+//        qtFlags |= Qt::WindowCloseButtonHint;
+//    }
+//    else
+//    {
+//        // Disable caption bar, include all buttons to be effective
+//        qtFlags &= ~Qt::WindowTitleHint;
+//        qtFlags &= ~Qt::WindowSystemMenuHint;
+//        qtFlags &= ~Qt::WindowMinMaxButtonsHint;
+//        qtFlags &= ~Qt::WindowCloseButtonHint;
+//    }
+//
+//    GetHandle()->setWindowFlags( qtFlags );
+//
+//    // Validate border styles
+//    int numberOfBorderStyles = 0;
+//    if ( HasFlag( wxBORDER_NONE ))
+//        numberOfBorderStyles++;
+//    if ( HasFlag( wxBORDER_STATIC ))
+//        numberOfBorderStyles++;
+//    if ( HasFlag( wxBORDER_SIMPLE ))
+//        numberOfBorderStyles++;
+//    if ( HasFlag( wxBORDER_RAISED ))
+//        numberOfBorderStyles++;
+//    if ( HasFlag( wxBORDER_SUNKEN ))
+//        numberOfBorderStyles++;
+//    if ( HasFlag( wxBORDER_THEME ))
+//        numberOfBorderStyles++;
+//    wxCHECK_RET( numberOfBorderStyles <= 1, "Only one border style can be specified" );
+//
+//    // Borders only supported for QFrame's
+//    QFrame *qtFrame = qobject_cast< QFrame* >( QtGetContainer() );
+//    wxCHECK_RET( numberOfBorderStyles == 0 || qtFrame,
+//                 "Borders not supported for this window type (not QFrame)" );
+//
+//    if ( HasFlag( wxBORDER_NONE ) )
+//    {
+//        qtFrame->setFrameStyle( QFrame::NoFrame );
+//    }
+//    else if ( HasFlag( wxBORDER_STATIC ) )
+//    {
+//        wxMISSING_IMPLEMENTATION( "wxBORDER_STATIC" );
+//    }
+//    else if ( HasFlag( wxBORDER_SIMPLE ) )
+//    {
+//        qtFrame->setFrameStyle( QFrame::Panel );
+//        qtFrame->setFrameShadow( QFrame::Plain );
+//    }
+//    else if ( HasFlag( wxBORDER_RAISED ) )
+//    {
+//        qtFrame->setFrameStyle( QFrame::Panel );
+//        qtFrame->setFrameShadow( QFrame::Raised );
+//    }
+//    else if ( HasFlag( wxBORDER_SUNKEN ) )
+//    {
+//        qtFrame->setFrameStyle( QFrame::Panel );
+//        qtFrame->setFrameShadow( QFrame::Sunken );
+//    }
+//    else if ( HasFlag( wxBORDER_THEME ) )
+//    {
+//        qtFrame->setFrameStyle( QFrame::StyledPanel );
+//        qtFrame->setFrameShadow( QFrame::Plain );
+//    }
+}
+
+void wxWindowQt::SetExtraStyle( long exStyle )
+{
+    long exStyleOld = GetExtraStyle();
+    if ( exStyle == exStyleOld )
+        return;
+
+    // update the internal variable
+    wxWindowBase::SetExtraStyle(exStyle);
+
+    if (!m_qtWindow)
+        return;
+
+    Qt::WindowFlags flags = m_qtWindow->windowFlags();
+
+    if (!(exStyle & wxWS_EX_CONTEXTHELP) != !(flags & Qt::WindowContextHelpButtonHint))
+    {
+        flags ^= Qt::WindowContextHelpButtonHint;
+        m_qtWindow->setWindowFlags(flags);
+    }
+}
+
+
+
+void wxWindowQt::DoClientToScreen( int *x, int *y ) const
+{
+    QPoint screenPosition = GetHandle()->mapToGlobal( QPoint( *x, *y ));
+    *x = screenPosition.x();
+    *y = screenPosition.y();
+}
+
+    
+void wxWindowQt::DoScreenToClient( int *x, int *y ) const
+{
+    QPoint clientPosition = GetHandle()->mapFromGlobal( QPoint( *x, *y ));
+    *x = clientPosition.x();
+    *y = clientPosition.y();
+}
+    
+
+void wxWindowQt::DoCaptureMouse()
+{
+    wxCHECK_RET( GetHandle() != NULL, wxT("invalid window") );
+    GetHandle()->grabMouse();
+    s_capturedWindow = this;
+}
+
+
+void wxWindowQt::DoReleaseMouse()
+{
+    wxCHECK_RET( GetHandle() != NULL, wxT("invalid window") );
+    GetHandle()->releaseMouse();
+    s_capturedWindow = NULL;
+}
+
+wxWindowQt *wxWindowBase::GetCapture()
+{
+    return s_capturedWindow;
+}
+
+
+void wxWindowQt::DoGetPosition(int *x, int *y) const
+{
+    QWidget *qtWidget = GetHandle();
+    *x = qtWidget->x();
+    *y = qtWidget->y();
+}
+
+
+void wxWindowQt::DoGetSize(int *width, int *height) const
+{
+    QSize size = GetHandle()->frameSize();
+    QRect rect = GetHandle()->frameGeometry();
+    wxASSERT( size.width() == rect.width() );
+    wxASSERT( size.height() == rect.height() );
+
+    *width = rect.width();
+    *height = rect.height();
+}
+
+    
+
+void wxWindowQt::DoSetSize(int x, int y, int width, int height, int sizeFlags )
+{
+    int currentX, currentY;
+    GetPosition( &currentX, &currentY );
+    if ( x == wxDefaultCoord && !( sizeFlags & wxSIZE_ALLOW_MINUS_ONE ))
+        x = currentX;
+    if ( y == wxDefaultCoord && !( sizeFlags & wxSIZE_ALLOW_MINUS_ONE ))
+        y = currentY;
+
+    // Should we use the best size:
+
+    if (( width == wxDefaultCoord && ( sizeFlags & wxSIZE_AUTO_WIDTH )) ||
+        ( height == wxDefaultCoord && ( sizeFlags & wxSIZE_AUTO_HEIGHT )))
+    {
+        const wxSize BEST_SIZE = GetBestSize();
+        if ( width == wxDefaultCoord && ( sizeFlags & wxSIZE_AUTO_WIDTH ))
+            width = BEST_SIZE.x;
+        if ( height == wxDefaultCoord && ( sizeFlags & wxSIZE_AUTO_HEIGHT ))
+            height = BEST_SIZE.y;
+    }
+    DoMoveWindow( x, y, width, height );
+}
+
+
+void wxWindowQt::DoGetClientSize(int *width, int *height) const
+{
+    QRect geometry = GetHandle()->geometry();
+    *width = geometry.width();
+    *height = geometry.height();
+}
+
+    
+void wxWindowQt::DoSetClientSize(int width, int height)
+{
+    QWidget *qtWidget = GetHandle();
+    QRect geometry = qtWidget->geometry();
+    geometry.setWidth( width );
+    geometry.setHeight( height );
+    qtWidget->setGeometry( geometry );
+}
+
+void wxWindowQt::DoMoveWindow(int x, int y, int width, int height)
+{
+    QWidget *qtWidget = GetHandle();
+
+    qtWidget->move( x, y );
+    qtWidget->resize( width, height );
+}
+
+
+#if wxUSE_TOOLTIPS
+void wxWindowQt::DoSetToolTip( wxToolTip *tip )
+{
+    wxWindowBase::DoSetToolTip( tip );
+    
+    if ( tip != NULL )
+        GetHandle()->setToolTip( wxQtConvertString( tip->GetTip() ));
+    else
+        GetHandle()->setToolTip( QString() );
+}
+#endif // wxUSE_TOOLTIPS
+
+
+#if wxUSE_MENUS
+bool wxWindowQt::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+    menu->GetHandle()->exec( GetHandle()->mapToGlobal( QPoint( x, y ) ) );
+
+    return ( true );
+}
+#endif // wxUSE_MENUS
+
+#if wxUSE_ACCEL
+void wxWindowQt::SetAcceleratorTable( const wxAcceleratorTable& accel )
+{
+    wxWindowBase::SetAcceleratorTable( accel );
+    
+    // Disable previously set accelerators
+    while ( !m_qtShortcuts.isEmpty() )
+        delete m_qtShortcuts.takeFirst();
+    
+    // Create new shortcuts (use GetHandle() so all events inside
+    // the window are handled, not only in the container subwindow)
+    m_qtShortcuts = accel.ConvertShortcutTable( GetHandle() );
+    
+    // Connect shortcuts to window
+    Q_FOREACH( QShortcut *s, m_qtShortcuts )
+    {
+        QObject::connect( s, &QShortcut::activated, m_qtShortcutHandler, &wxQtShortcutHandler::activated );
+        QObject::connect( s, &QShortcut::activatedAmbiguously, m_qtShortcutHandler, &wxQtShortcutHandler::activated );
+    }
+}
+#endif // wxUSE_ACCEL
+
+bool wxWindowQt::SetBackgroundStyle(wxBackgroundStyle style)
+{
+    if (!wxWindowBase::SetBackgroundStyle(style))
+        return false;
+    // NOTE this could be called before creation, so it will be delayed:
+    return QtSetBackgroundStyle();
+}
+
+bool wxWindowQt::QtSetBackgroundStyle()
+{
+    QWidget *widget;
+    // if it is a scroll area, don't make transparent (invisible) scroll bars:
+    if ( QtGetScrollBarsContainer() )
+        widget = QtGetScrollBarsContainer()->viewport();
+    else
+        widget = GetHandle();
+    // check if the control is created (wxGTK requires calling it before):
+    if ( widget != NULL )
+    {
+        if (m_backgroundStyle == wxBG_STYLE_PAINT)
+        {
+            // wx paint handler will draw the invalidated region completely:
+            widget->setAttribute(Qt::WA_OpaquePaintEvent);
+        }
+        else if (m_backgroundStyle == wxBG_STYLE_TRANSPARENT)
+        {
+            widget->setAttribute(Qt::WA_TranslucentBackground);
+            // avoid a default background color (usually black):
+            widget->setStyleSheet("background:transparent;");
+        }
+        else if (m_backgroundStyle == wxBG_STYLE_SYSTEM)
+        {
+            // let Qt erase the background by default
+            // (note that wxClientDC will not work)
+            //widget->setAutoFillBackground(true);
+            // use system colors for background (default in Qt)
+            widget->setAttribute(Qt::WA_NoSystemBackground, false);
+        }
+        else if (m_backgroundStyle == wxBG_STYLE_ERASE)
+        {
+            // erase events will be fired, if not handled, wx will clear the DC
+            widget->setAttribute(Qt::WA_OpaquePaintEvent);
+            // Qt should not clear the background (default):
+            widget->setAutoFillBackground(false);
+        }
+    }
+    return true;
+}
+
+
+bool wxWindowQt::IsTransparentBackgroundSupported(wxString* WXUNUSED(reason)) const
+{
+    return true;
+}
+
+bool wxWindowQt::SetTransparent(wxByte alpha)
+{
+    // For Qt, range is between 1 (opaque) and 0 (transparent)
+    GetHandle()->setWindowOpacity(1 - alpha/255.0);
+    return true;
+}
+
+
+bool wxWindowQt::QtHandlePaintEvent ( QWidget *handler, QPaintEvent *event )
+{
+    /* If this window has scrollbars, only let wx handle the event if it is
+     * for the client area (the scrolled part). Events for the whole window
+     * (including scrollbars and maybe status or menu bars are handled by Qt */
+
+    if ( QtGetScrollBarsContainer() && handler != QtGetScrollBarsContainer() )
+    {
+        return false;
+    }
+    else
+    {
+        // use the Qt event region:
+        m_updateRegion.QtSetRegion( event->region() );
+
+        if (false)
+            wxLogDebug(wxT("wxWindow::QtHandlePaintEvent %s %s region %d %d %d %d"),
+                   (const char*)GetName(),
+                   m_qtPicture->isNull() ? "wxPaintDC" : "wxClientDC",
+                   m_updateRegion.GetBox().x, m_updateRegion.GetBox().y,
+                   m_updateRegion.GetBox().width, m_updateRegion.GetBox().height);
+
+        // Prepare the Qt painter for wxWindowDC:
+        bool ok = false;
+        if ( QtGetScrollBarsContainer() )
+        {
+            // QScrollArea can only draw in the viewport:
+            ok = m_qtPainter->begin( QtGetScrollBarsContainer()->viewport() );
+        }
+        if ( !ok )
+        {
+            // Start the paint in the widget itself
+            ok =  m_qtPainter->begin( GetHandle() );
+        }
+
+        if ( ok )
+        {
+            bool handled;
+
+            if ( m_qtPicture->isNull() )
+            {
+                // Real paint event (not for wxClientDC), prepare the background
+                switch ( GetBackgroundStyle() )
+                {
+                    case wxBG_STYLE_TRANSPARENT:
+                        if (IsTransparentBackgroundSupported())
+                        {
+                            // Set a transparent background, so that overlaying in parent
+                            // might indeed let see through where this child did not
+                            // explicitly paint. See wxBG_STYLE_SYSTEM for more comment
+                        }
+                        break;
+                    case wxBG_STYLE_ERASE:
+                        {
+                            // the background should be cleared by qt auto fill
+                            // send the erase event (properly creating a DC for it)
+                            wxPaintDC dc( this );
+                            dc.SetDeviceClippingRegion( m_updateRegion );
+
+                            wxEraseEvent erase( GetId(), &dc );
+                            if ( ProcessWindowEvent(erase) )
+                            {
+                                // background erased, don't do it again
+                                break;
+                            }
+                            // Ensure DC is cleared if handler didn't and Qt will not do it
+                            if ( UseBgCol() && !GetHandle()->autoFillBackground() )
+                            {
+                                wxLogDebug(wxT("wxWindow::QtHandlePaintEvent %s clearing DC to %s"),
+                                           (const char*)GetName(), GetBackgroundColour().GetAsString()
+                                           );
+                                dc.SetBackground(GetBackgroundColour());
+                                dc.Clear();
+                            }
+                        }
+                        // fall through
+                    case wxBG_STYLE_SYSTEM:
+                        if ( GetThemeEnabled() )
+                        {
+                            // let qt render the background:
+                            // commented out as this will cause recursive painting
+                            // this should be done outside using setBackgroundRole
+                            // setAutoFillBackground or setAttribute
+                            //wxWindowDC dc( (wxWindow*)this );
+                            //widget->render(m_qtPainter);
+                        }
+                        break;
+                    case wxBG_STYLE_PAINT:
+                        // nothing to do: window will be painted over in EVT_PAINT
+                        break;
+
+                    case wxBG_STYLE_COLOUR:
+                        wxFAIL_MSG( "unsupported background style" );
+                }
+
+                // send the paint event (wxWindowDC will draw directly):
+                wxPaintEvent paint( GetId() );
+                handled = ProcessWindowEvent(paint);
+                m_updateRegion.Clear();
+            }
+            else
+            {
+                // Data from wxClientDC, paint it
+                m_qtPicture->play( m_qtPainter );
+                // Reset picture
+                m_qtPicture->setData( NULL, 0 );
+                handled = true;
+            }
+
+            // commit changes of the painter to the widget
+            m_qtPainter->end();
+
+            return handled;
+        }
+        else
+        {
+            // Painter didn't begun, not handled by wxWidgets:
+            wxLogDebug(wxT("wxWindow::QtHandlePaintEvent %s Qt widget painter begin failed"),
+                       (const char*)GetName() );
+            return false;
+        }
+    }
+}
+
+bool wxWindowQt::QtHandleResizeEvent ( QWidget *WXUNUSED( handler ), QResizeEvent *event )
+{
+    wxSizeEvent e( wxQtConvertSize( event->size() ) );
+
+    return ProcessWindowEvent( e );
+}
+
+bool wxWindowQt::QtHandleWheelEvent ( QWidget *WXUNUSED( handler ), QWheelEvent *event )
+{
+    wxMouseEvent e( wxEVT_MOUSEWHEEL );
+    e.m_wheelAxis = ( event->orientation() == Qt::Vertical ) ? wxMOUSE_WHEEL_VERTICAL : wxMOUSE_WHEEL_HORIZONTAL;
+    e.m_wheelRotation = event->delta();
+    e.m_linesPerAction = 3;
+    e.m_wheelDelta = 120;
+    
+    return ProcessWindowEvent( e );
+}
+
+
+bool wxWindowQt::QtHandleKeyEvent ( QWidget *WXUNUSED( handler ), QKeyEvent *event )
+{
+#if wxUSE_ACCEL
+    if ( m_processingShortcut )
+    {
+        /* Enter here when a shortcut isn't handled by Qt.
+         * Return true to avoid Qt-processing of the event
+         * Instead, use the flag to indicate that it wasn't processed */
+        m_processingShortcut = false;
+        
+        return true;
+    }
+#endif // wxUSE_ACCEL
+
+    bool handled = false;
+
+    // Build the event
+    wxKeyEvent e( event->type() == QEvent::KeyPress ? wxEVT_KEY_DOWN : wxEVT_KEY_UP );
+    // TODO: m_x, m_y
+    e.m_keyCode = wxQtConvertKeyCode( event->key(), event->modifiers() );
+
+    if ( event->text().isEmpty() )
+        e.m_uniChar = 0;
+    else
+        e.m_uniChar = event->text().at( 0 ).unicode();
+    
+    e.m_rawCode = event->nativeVirtualKey();
+    e.m_rawFlags = event->nativeModifiers();
+
+    // Modifiers
+    wxQtFillKeyboardModifiers( event->modifiers(), &e );
+
+    handled = ProcessWindowEvent( e );
+
+    // On key presses, send the EVT_CHAR event
+    if ( !handled && event->type() == QEvent::KeyPress )
+    {
+#if wxUSE_ACCEL
+        // Check for accelerators
+        if ( !m_processingShortcut )
+        {
+            /* The call to notify() will try to execute a shortcut. If it fails
+             * it will call keyPressEvent() in our wxQtWidget which calls back
+             * to this function. We use the m_processingShortcut flag to avoid
+             * processing that recursive call and return back to this one. */
+            m_processingShortcut = true;
+            
+            QApplication::instance()->notify( GetHandle(), event );
+            
+            handled = m_processingShortcut;
+            m_processingShortcut = false;
+            
+            if ( handled )
+                return true;
+        }
+#endif // wxUSE_ACCEL
+
+        e.SetEventType( wxEVT_CHAR );
+
+        // Translated key code (including control + letter -> 1-26)
+        int translated = 0;
+        if ( !event->text().isEmpty() )
+            translated = event->text().at( 0 ).toLatin1();
+        if ( translated )
+            e.m_keyCode = translated;
+        
+        handled = ProcessWindowEvent( e );
+    }
+    
+    return handled;
+}
+
+bool wxWindowQt::QtHandleMouseEvent ( QWidget *handler, QMouseEvent *event )
+{
+    // Convert event type
+    wxEventType wxType = 0;
+    switch ( event->type() )
+    {
+        case QEvent::MouseButtonDblClick:
+            switch ( event->button() )
+            {
+                case Qt::LeftButton:
+                    wxType = wxEVT_LEFT_DCLICK;
+                    break;
+                case Qt::RightButton:
+                    wxType = wxEVT_RIGHT_DCLICK;
+                    break;
+                case Qt::MidButton:
+                    wxType = wxEVT_MIDDLE_DCLICK;
+                    break;
+                case Qt::XButton1:
+                    wxType = wxEVT_AUX1_DCLICK;
+                    break;
+                case Qt::XButton2:
+                    wxType = wxEVT_AUX2_DCLICK;
+                    break;
+                case Qt::NoButton:
+                case Qt::MouseButtonMask: // Not documented ?
+                default:
+                    return false;
+            }
+            break;
+        case QEvent::MouseButtonPress:
+            switch ( event->button() )
+            {
+                case Qt::LeftButton:
+                    wxType = wxEVT_LEFT_DOWN;
+                    break;
+                case Qt::RightButton:
+                    wxType = wxEVT_RIGHT_DOWN;
+                    break;
+                case Qt::MidButton:
+                    wxType = wxEVT_MIDDLE_DOWN;
+                    break;
+                case Qt::XButton1:
+                    wxType = wxEVT_AUX1_DOWN;
+                    break;
+                case Qt::XButton2:
+                    wxType = wxEVT_AUX2_DOWN;
+                case Qt::NoButton:
+                case Qt::MouseButtonMask: // Not documented ?
+                default:
+                    return false;
+            }
+            break;
+        case QEvent::MouseButtonRelease:
+            switch ( event->button() )
+            {
+                case Qt::LeftButton:
+                    wxType = wxEVT_LEFT_UP;
+                    break;
+                case Qt::RightButton:
+                    wxType = wxEVT_RIGHT_UP;
+                    break;
+                case Qt::MidButton:
+                    wxType = wxEVT_MIDDLE_UP;
+                    break;
+                case Qt::XButton1:
+                    wxType = wxEVT_AUX1_UP;
+                    break;
+                case Qt::XButton2:
+                    wxType = wxEVT_AUX2_UP;
+                case Qt::NoButton:
+                case Qt::MouseButtonMask: // Not documented ?
+                default:
+                    return false;
+            }
+            break;
+        case QEvent::MouseMove:
+            wxType = wxEVT_MOTION;
+            break;
+        default:
+            // Unknown event type
+            wxFAIL_MSG( "Unknown mouse event type" );
+    }
+
+    // Fill the event
+    QPoint mousePos = event->pos();
+    wxMouseEvent e( wxType );
+    e.m_clickCount = -1;
+    e.SetPosition( wxQtConvertPoint( mousePos ) );
+
+    // Mouse buttons
+    wxQtFillMouseButtons( event->buttons(), &e );
+
+    // Keyboard modifiers
+    wxQtFillKeyboardModifiers( event->modifiers(), &e );
+
+    bool handled = ProcessWindowEvent( e );
+
+    // Determine if mouse is inside the widget
+    bool mouseInside = true;
+    if ( mousePos.x() < 0 || mousePos.x() > handler->width() ||
+        mousePos.y() < 0 || mousePos.y() > handler->height() )
+        mouseInside = false;
+    
+    if ( e.GetEventType() == wxEVT_MOTION )
+    {
+        /* Qt doesn't emit leave/enter events while the mouse is grabbed
+        * and it automatically grabs the mouse while dragging. In that cases
+        * we emulate the enter and leave events */
+
+        // Mouse enter/leaves
+        if ( m_mouseInside != mouseInside )
+        {
+            if ( mouseInside )
+                e.SetEventType( wxEVT_ENTER_WINDOW );
+            else
+                e.SetEventType( wxEVT_LEAVE_WINDOW );
+
+            ProcessWindowEvent( e );
+            m_mouseInside = mouseInside;
+        }
+    }
+
+    m_mouseInside = mouseInside;
+    
+    return handled;
+}
+
+bool wxWindowQt::QtHandleEnterEvent ( QWidget *handler, QEvent *event )
+{
+    wxMouseEvent e( event->type() == QEvent::Enter ? wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW );
+    e.m_clickCount = 0;
+    e.SetPosition( wxQtConvertPoint( handler->mapFromGlobal( QCursor::pos() ) ) );
+    
+    // Mouse buttons
+    wxQtFillMouseButtons( QApplication::mouseButtons(), &e );
+    
+    // Keyboard modifiers
+    wxQtFillKeyboardModifiers( QApplication::keyboardModifiers(), &e );
+    
+    return ProcessWindowEvent( e );
+}
+
+bool wxWindowQt::QtHandleMoveEvent ( QWidget *handler, QMoveEvent *event )
+{
+    if ( GetHandle() != handler )
+        return false;
+    
+    wxMoveEvent e( wxQtConvertPoint( event->pos() ) );
+
+    return ProcessWindowEvent( e );
+}
+
+bool wxWindowQt::QtHandleShowEvent ( QWidget *handler, QEvent *event )
+{
+    if ( GetHandle() != handler )
+        return false;
+    
+    wxShowEvent e;
+    e.SetShow( event->type() == QEvent::Show );
+
+    return ProcessWindowEvent( e );
+}
+
+bool wxWindowQt::QtHandleChangeEvent ( QWidget *handler, QEvent *event )
+{
+    if ( GetHandle() != handler )
+        return false;
+
+    if ( event->type() == QEvent::ActivationChange )
+    {
+        wxActivateEvent e( wxEVT_ACTIVATE, handler->isActiveWindow() );
+
+        return ProcessWindowEvent( e );
+    }
+    else
+        return false;
+}
+
+bool wxWindowQt::QtHandleCloseEvent ( QWidget *handler, QCloseEvent *WXUNUSED( event ) )
+{
+    if ( GetHandle() != handler )
+        return false;
+    
+    int close = Close();
+    if ( close )
+    {
+        Destroy();
+    }
+    return close;
+}
+
+bool wxWindowQt::QtHandleContextMenuEvent ( QWidget *WXUNUSED( handler ), QContextMenuEvent *event )
+{
+    wxContextMenuEvent e( wxEVT_CONTEXT_MENU );
+    e.SetPosition( wxQtConvertPoint( event->globalPos() ) );
+    
+    return ProcessWindowEvent( e );
+}
+
+bool wxWindowQt::QtHandleFocusEvent ( QWidget *WXUNUSED( handler ), QFocusEvent *event )
+{
+    wxFocusEvent e( event->gotFocus() ? wxEVT_SET_FOCUS : wxEVT_KILL_FOCUS );
+
+    bool handled = ProcessWindowEvent( e );
+
+    wxWindowQt *parent = GetParent();
+    if ( event->gotFocus() && parent )
+    {
+        wxChildFocusEvent childEvent( this );
+        parent->ProcessWindowEvent( childEvent );
+    }
+    
+    return handled;
+}
+
+#if wxUSE_ACCEL
+void wxWindowQt::QtHandleShortcut ( int command )
+{
+    if (command != -1)
+    {
+        wxCommandEvent menu_event( wxEVT_COMMAND_MENU_SELECTED, command );
+        bool ret = ProcessWindowEvent( menu_event );
+        
+        if ( !ret )
+        {
+            // if the accelerator wasn't handled as menu event, try
+            // it as button click (for compatibility with other
+            // platforms):
+            wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command );
+            ProcessWindowEvent( button_event );
+        }
+    }
+}
+#endif // wxUSE_ACCEL
+
+QWidget *wxWindowQt::GetHandle() const
+{
+    return m_qtWindow;
+}
+
+QAbstractScrollArea *wxWindowQt::QtGetScrollBarsContainer() const
+{
+    return m_qtContainer;
+}
+
+QPicture *wxWindowQt::QtGetPicture() const
+{
+    return m_qtPicture;
+}
+
+QPainter *wxWindowQt::QtGetPainter()
+{
+    return m_qtPainter;
+}
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9e83b3d235..08d8a5a62b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -44,6 +44,7 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -55,7 +56,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 \
-	$(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	test_test.o \
 	test_anytest.o \
@@ -145,7 +146,8 @@ TEST_ODEP =  $(_____pch_testprec_test_testprec_h_gch___depname)
 TEST_DRAWING_CXXFLAGS = $(__test_drawing_PCH_INC) -D__WX$(TOOLKIT)__ \
 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	-DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_DRAWING_OBJECTS =  \
 	test_drawing_test.o \
 	test_drawing_drawing.o \
@@ -163,8 +165,8 @@ TEST_DRAWINGPLUGIN_OBJECTS =  \
 TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \
 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../samples $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(CPPFLAGS) \
-	$(CXXFLAGS)
+	-I$(srcdir)/../samples $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(__test_gui___win32rc) \
 	test_gui_asserthelper.o \
diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index ed580d26f0..39c8c680c6 100644
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -33,6 +33,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -43,8 +44,8 @@ WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(wx_top_builddir)/lib
 BENCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
-	$(CXXFLAGS)
+	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
 BENCH_OBJECTS =  \
 	bench_bench.o \
 	bench_datetime.o \
@@ -59,7 +60,7 @@ BENCH_OBJECTS =  \
 BENCH_GUI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
-	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 BENCH_GUI_OBJECTS =  \
 	$(__bench_gui___win32rc) \
 	bench_gui_bench.o \