This commit was manufactured by cvs2svn to create tag 'WX_2_5_1'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_5_1@25927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 14:12:36 +00:00
779 changed files with 128619 additions and 137241 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -1327,7 +1327,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
 	wx/mac/dcscreen.h \
 	wx/mac/dialog.h \
 	wx/mac/dirdlg.h \
-	wx/mac/display.h \
 	wx/mac/dnd.h \
 	wx/mac/filedlg.h \
 	wx/mac/font.h \
@@ -1373,7 +1372,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
 	wx/mac/tabctrl.h \
 	wx/mac/textctrl.h \
 	wx/mac/timer.h \
-	wx/mac/tglbtn.h \
 	wx/mac/toolbar.h \
 	wx/mac/tooltip.h \
 	wx/mac/toplevel.h \
@@ -1415,7 +1413,6 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
 	wx/motif/cursor.h \
 	wx/motif/dataform.h \
 	wx/motif/dataobj.h \
-	wx/motif/dataobj2.h \
 	wx/motif/dc.h \
 	wx/motif/dcclient.h \
 	wx/motif/dcmemory.h \
@@ -2415,7 +2412,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
 	monodll_prntdlgg.o \
 	monodll_statusbr.o \
 	monodll_tabg.o \
-	monodll_fontdlgg.o \
 	monodll_bmpbuttn.o \
 	monodll_button.o \
 	monodll_checkbox.o \
@@ -2474,7 +2470,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
 	monodll_dcscreen.o \
 	monodll_dialog.o \
 	monodll_dirdlg.o \
-	monodll_display.o \
 	monodll_dnd.o \
 	monodll_filedlg.o \
 	monodll_font.o \
@@ -2515,7 +2510,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
 	monodll_tabctrl.o \
 	monodll_textctrl.o \
 	monodll_timer.o \
-	monodll_tglbtn.o \
 	monodll_toolbar.o \
 	monodll_tooltip.o \
 	monodll_toplevel.o \
@@ -3204,7 +3198,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
 	monolib_prntdlgg.o \
 	monolib_statusbr.o \
 	monolib_tabg.o \
-	monolib_fontdlgg.o \
 	monolib_bmpbuttn.o \
 	monolib_button.o \
 	monolib_checkbox.o \
@@ -3263,7 +3256,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
 	monolib_dcscreen.o \
 	monolib_dialog.o \
 	monolib_dirdlg.o \
-	monolib_display.o \
 	monolib_dnd.o \
 	monolib_filedlg.o \
 	monolib_font.o \
@@ -3304,7 +3296,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
 	monolib_tabctrl.o \
 	monolib_textctrl.o \
 	monolib_timer.o \
-	monolib_tglbtn.o \
 	monolib_toolbar.o \
 	monolib_tooltip.o \
 	monolib_toplevel.o \
@@ -4152,7 +4143,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
 	coredll_prntdlgg.o \
 	coredll_statusbr.o \
 	coredll_tabg.o \
-	coredll_fontdlgg.o \
 	coredll_bmpbuttn.o \
 	coredll_button.o \
 	coredll_checkbox.o \
@@ -4211,7 +4201,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
 	coredll_dcscreen.o \
 	coredll_dialog.o \
 	coredll_dirdlg.o \
-	coredll_display.o \
 	coredll_dnd.o \
 	coredll_filedlg.o \
 	coredll_font.o \
@@ -4252,7 +4241,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
 	coredll_tabctrl.o \
 	coredll_textctrl.o \
 	coredll_timer.o \
-	coredll_tglbtn.o \
 	coredll_toolbar.o \
 	coredll_tooltip.o \
 	coredll_toplevel.o \
@@ -4816,7 +4804,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
 	corelib_prntdlgg.o \
 	corelib_statusbr.o \
 	corelib_tabg.o \
-	corelib_fontdlgg.o \
 	corelib_bmpbuttn.o \
 	corelib_button.o \
 	corelib_checkbox.o \
@@ -4875,7 +4862,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
 	corelib_dcscreen.o \
 	corelib_dialog.o \
 	corelib_dirdlg.o \
-	corelib_display.o \
 	corelib_dnd.o \
 	corelib_filedlg.o \
 	corelib_font.o \
@@ -4916,7 +4902,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
 	corelib_tabctrl.o \
 	corelib_textctrl.o \
 	corelib_timer.o \
-	corelib_tglbtn.o \
 	corelib_toolbar.o \
 	corelib_tooltip.o \
 	corelib_toplevel.o \
@@ -7735,12 +7720,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

-@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
-
@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONODLL_ODEP)
@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

+@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -8464,9 +8449,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/mac/display.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -8740,21 +8722,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@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) $<
-
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -9274,9 +9241,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/mac/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -9319,6 +9283,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@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) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -10351,12 +10327,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

-@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
-
@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONOLIB_ODEP)
@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

+@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11080,9 +11056,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/mac/display.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11356,21 +11329,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@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) $<
-
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11890,9 +11848,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/mac/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11935,6 +11890,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monolib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@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) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -12982,12 +12949,12 @@ netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP)
@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<

-@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP)
-@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
-
@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETDLL_ODEP)
@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<

+@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/os2/gsocket.c $(NETDLL_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
+
 netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
 	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<

@@ -13027,12 +12994,12 @@ netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP)
@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
@COND_PLATFORM_MACOSX_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<

-@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP)
-@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
-
@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETLIB_ODEP)
@COND_PLATFORM_WIN32_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<

+@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/os2/gsocket.c $(NETLIB_ODEP)
+@COND_PLATFORM_OS2_1@	$(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
+
 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -13960,9 +13927,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/mac/display.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -14236,21 +14200,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@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) $<
-
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -14770,9 +14719,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/mac/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -14815,6 +14761,18 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@coredll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@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) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -16081,9 +16039,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/mac/display.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -16357,21 +16312,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@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) $<
-
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -16891,9 +16831,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/mac/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -16936,6 +16873,18 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@corelib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@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) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -17744,9 +17693,6 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME)
 ALL_DIST: distrib_clean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	cp $(WXDIR)/configure.in $(DISTDIR)
-	cp $(WXDIR)/configure $(DISTDIR)
-	cp $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	cp $(WXDIR)/wxwin.m4 $(DISTDIR)
 	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
@@ -17781,9 +17727,15 @@ ALL_DIST: distrib_clean
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
+#	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
 	cp -Rf $(EXPATDIR) $(DISTDIR)/src
 	(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
 	mkdir $(DISTDIR)/src/iodbc
@@ -17802,6 +17754,8 @@ ALL_DIST: distrib_clean
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
+	cp $(WXDIR)/configure.in $(DISTDIR)
+	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
@@ -17924,7 +17878,7 @@ MOTIF_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/x11
 	mkdir $(DISTDIR)/include/wx/x11
 	cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
-		$(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \
+		$(X11DIR)/glcanvas.cpp $(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
 		$(DISTDIR)/src/x11
 	cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
 		$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
@@ -17975,6 +17929,9 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
+	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)

 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
@@ -18631,26 +18588,64 @@ MANUAL_DIST:
 	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx

-
-# Copy all the files from wxPython needed for the Debian source package, 
-# and then remove some that are not needed.
+# this target does not generate a complete wxPython dist, it only includes
+# those files needed for the Debian source package.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
 PYTHON_DIST:
-	for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \
-		echo "Copying dir: $$dir..."; \
-		mkdir $(DISTDIR)/$$dir; \
-		cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
-	done; \
-	\
-	find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.orig"      >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.rej"       >> RM_FILES; \
-	for f in `cat RM_FILES`; do rm $$f; done; \
-	rm RM_FILES
+	mkdir $(DISTDIR)/wxPython
+	mkdir $(DISTDIR)/wxPython/contrib
+	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/stc
+	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/xrc
+	mkdir $(DISTDIR)/wxPython/demo
+	mkdir $(DISTDIR)/wxPython/demo/bitmaps
+	mkdir $(DISTDIR)/wxPython/demo/bmp_source
+	mkdir $(DISTDIR)/wxPython/demo/data
+	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/src
+	mkdir $(DISTDIR)/wxPython/src/gtk
+	mkdir $(DISTDIR)/wxPython/scripts
+	mkdir $(DISTDIR)/wxPython/wxPython
+	mkdir $(DISTDIR)/wxPython/wxPython/lib
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+	mkdir $(DISTDIR)/wxPython/wxPython/tools
+	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed

+	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
+	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
+	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
+	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
+	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed

 distrib_clean:
 	$(RM) -r _dist_dir
@@ -18744,33 +18739,12 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.

-	rm -rf $(DISTDIR)/contrib/build
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
-			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
-			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
-			   -o -name "*.vpj" -o -name "*.sc"                      \
-			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-			\) -print0 | xargs -0 rm -rf
-
-	rm -rf $(DISTDIR)/wxPython/SWIG
-	rm -rf $(DISTDIR)/wxPython/distrib
-	rm -rf $(DISTDIR)/wxPython/distutils
-	rm -rf $(DISTDIR)/wxPython/samples
-	rm -rf $(DISTDIR)/wxPython/contrib/iewin
-	find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
-
-	@# We can't get at the individual components of the version here
-	@# anymore, so strip the major and minor version out of the blob.
-
-	(								\
-	wx_version=$(WX_VERSION);					\
-	wx_release=$${wx_version%.*};					\
-	rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};	\
-	mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\
-	)
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+			-print0 | xargs -0 rm -rf

+	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)

 debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -88,11 +88,14 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
 dnl or only the old <iostream.h> one - it may be generally assumed that if
 dnl <iostream> exists, the other "new" headers (without .h) exist too.
 dnl
-dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
+dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
 dnl ---------------------------------------------------------------------------

 AC_DEFUN([WX_CPP_NEW_HEADERS],
 [
+  if test "$cross_compiling" = "yes"; then
+    ifelse([$2], , :, [$2])
+  else
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS

@@ -105,6 +108,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
    fi

    AC_LANG_RESTORE
+  fi
 ])

 dnl ---------------------------------------------------------------------------
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1091,7 +1091,7 @@ AC_DEFUN(PKG_CHECK_MODULES, [
 dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
 dnl
-AC_DEFUN([AM_PATH_SDL],
+AC_DEFUN(AM_PATH_SDL,
 [dnl 
 dnl Get the cflags and libraries from the sdl-config script
 dnl
@@ -1402,8 +1402,6 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
            DLLPREFIX=""
        ;;
        *-pc-os2_emx | *-pc-os2-emx )
-            SO_SUFFIX="dll"
-            SO_SUFFIX_MODULE="dll"
            EXEEXT=".exe"
            DLLPREFIX=""
            LIBPREFIX=""
@@ -1655,16 +1653,11 @@ EOF
        PIC_FLAG=""
      ;;
      
-      *-pc-os2_emx | *-pc-os2-emx )
-        SHARED_LD_CC="dllar.sh -o"
-        SHARED_LD_CXX="dllar.sh -o"
-        PIC_FLAG=""
-      ;;
-      
      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
      *-*-sunos4* | \
      *-*-osf* | \
      *-*-dgux5* | \
+      *-pc-os2_emx | *-pc-os2-emx | \
      *-*-sysv5* )
        dnl defaults are ok
      ;;
@@ -2022,84 +2015,3 @@ AC_DEFUN(AC_BAKEFILE,
    builtin(include, autoconf_inc.m4)
 ])

-dnl
-dnl AM_PATH_CPPUNIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-AC_DEFUN(AM_PATH_CPPUNIT,
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-
-
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -2,6 +2,9 @@ dnl This macro was generated by
 dnl Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!

+
+dnl Conditions:
+
 dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS

--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -44,7 +44,6 @@
        ../../contrib/samples/*/*.bkl
        ../../contrib/samples/*/*/*.bkl
        ../../contrib/utils/*/*.bkl
-        ../../tests/*.bkl
    </input>

    <!-- List of output formats to generate: -->
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -62,11 +62,6 @@
        </if>
    </template>

-    <template id="wx_test_console" template="wx_sample_console">
-        <cppflags>$(CPPUNIT_CFLAGS)</cppflags>
-        <ldflags>$(CPPUNIT_LIBS)</ldflags>
-    </template>
-    
    
    <!-- =============================================================== -->
    <!--                    Support for samples data files:              -->
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -177,23 +177,6 @@ where object files are stored as well as the location of
 compiled .lib files and setup.h under the lib/ toplevel directory.
        </description>
    </option>
-
-    <!-- unit tests support: -->
-    <option name="CPPUNIT_CFLAGS">
-        <default-value></default-value>
-        <description>
-Compiler flags needed to compile test suite in tests directory. If you want
-to run the tests, set it so that the compiler can find CppUnit headers.
-        </description>
-    </option>
-    
-    <option name="CPPUNIT_LIBS">
-        <default-value></default-value>
-        <description>
-Linker flags needed to link test suite in tests directory. If you want
-to run the tests, include CppUnit library here.
-        </description>
-    </option>
    
    
    <!-- ================================================================== -->
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -323,7 +323,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>

 <set var="NET_OS2_SRC" hints="files">
-    src/unix/gsocket.c
+    src/os2/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
    wx/unix/gsockunx.h
@@ -708,8 +708,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/generic/prntdlgg.cpp
    src/generic/statusbr.cpp
    src/generic/tabg.cpp
-    <!-- Generic implementations used by wxGPE: -->
-    src/generic/fontdlgg.cpp
    <!-- GTK+ specific files: -->
    src/gtk/bmpbuttn.cpp
    src/gtk/button.cpp
@@ -926,7 +924,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/motif/cursor.h
    wx/motif/dataform.h
    wx/motif/dataobj.h
-    wx/motif/dataobj2.h
    wx/motif/dc.h
    wx/motif/dcclient.h
    wx/motif/dcmemory.h
@@ -1551,7 +1548,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/mac/dcscreen.cpp
    src/mac/dialog.cpp
    src/mac/dirdlg.cpp
-    src/mac/display.cpp
    src/mac/dnd.cpp
    src/mac/filedlg.cpp
    src/mac/font.cpp
@@ -1592,7 +1588,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/mac/tabctrl.cpp
    src/mac/textctrl.cpp
    src/mac/timer.cpp
-    src/mac/tglbtn.cpp
    src/mac/toolbar.cpp
    src/mac/tooltip.cpp
    src/mac/toplevel.cpp
@@ -1637,7 +1632,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/mac/dcscreen.h
    wx/mac/dialog.h
    wx/mac/dirdlg.h
-    wx/mac/display.h
    wx/mac/dnd.h
    wx/mac/filedlg.h
    wx/mac/font.h
@@ -1683,7 +1677,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/mac/tabctrl.h
    wx/mac/textctrl.h
    wx/mac/timer.h
-    wx/mac/tglbtn.h
    wx/mac/toolbar.h
    wx/mac/tooltip.h
    wx/mac/toplevel.h
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -67,9 +67,6 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME)
 ALL_DIST: distrib_clean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	cp $(WXDIR)/configure.in $(DISTDIR)
-	cp $(WXDIR)/configure $(DISTDIR)
-	cp $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	cp $(WXDIR)/wxwin.m4 $(DISTDIR)
 	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
@@ -104,9 +101,15 @@ ALL_DIST: distrib_clean
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
+	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
+#	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
 	cp -Rf $(EXPATDIR) $(DISTDIR)/src
 	(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
 	mkdir $(DISTDIR)/src/iodbc
@@ -125,6 +128,8 @@ ALL_DIST: distrib_clean
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
+	cp $(WXDIR)/configure.in $(DISTDIR)
+	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
@@ -298,6 +303,9 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
+	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)

 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
@@ -954,26 +962,64 @@ MANUAL_DIST:
 	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx

-
-# Copy all the files from wxPython needed for the Debian source package, 
-# and then remove some that are not needed.
+# this target does not generate a complete wxPython dist, it only includes
+# those files needed for the Debian source package.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
 PYTHON_DIST:
-	for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \
-		echo "Copying dir: $$dir..."; \
-		mkdir $(DISTDIR)/$$dir; \
-		cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
-	done; \
-	\
-	find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.orig"      >> RM_FILES; \
-	find $(DISTDIR)/wxPython -name "*.rej"       >> RM_FILES; \
-	for f in `cat RM_FILES`; do rm $$f; done; \
-	rm RM_FILES
+	mkdir $(DISTDIR)/wxPython
+	mkdir $(DISTDIR)/wxPython/contrib
+	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/stc
+	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/xrc
+	mkdir $(DISTDIR)/wxPython/demo
+	mkdir $(DISTDIR)/wxPython/demo/bitmaps
+	mkdir $(DISTDIR)/wxPython/demo/bmp_source
+	mkdir $(DISTDIR)/wxPython/demo/data
+	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/src
+	mkdir $(DISTDIR)/wxPython/src/gtk
+	mkdir $(DISTDIR)/wxPython/scripts
+	mkdir $(DISTDIR)/wxPython/wxPython
+	mkdir $(DISTDIR)/wxPython/wxPython/lib
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+	mkdir $(DISTDIR)/wxPython/wxPython/tools
+	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed

+	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
+	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
+	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
+	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
+	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed

 distrib_clean:
 	$(RM) -r _dist_dir
@@ -1067,33 +1113,12 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.

-	rm -rf $(DISTDIR)/contrib/build
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
-			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
-			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
-			   -o -name "*.vpj" -o -name "*.sc"                      \
-			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-			\) -print0 | xargs -0 rm -rf
-
-	rm -rf $(DISTDIR)/wxPython/SWIG
-	rm -rf $(DISTDIR)/wxPython/distrib
-	rm -rf $(DISTDIR)/wxPython/distutils
-	rm -rf $(DISTDIR)/wxPython/samples
-	rm -rf $(DISTDIR)/wxPython/contrib/iewin
-	find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
-
-	@# We can't get at the individual components of the version here
-	@# anymore, so strip the major and minor version out of the blob.
-
-	(								\
-	wx_version=$(WX_VERSION);					\
-	wx_release=$${wx_version%.*};					\
-	rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};	\
-	mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\
-	)
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+			-print0 | xargs -0 rm -rf

+	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)

 debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST

--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -124,18 +124,6 @@ VENDOR = custom
 CFG = 
 !endif

-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-!ifndef CPPUNIT_CFLAGS
-CPPUNIT_CFLAGS = 
-!endif
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-!ifndef CPPUNIT_LIBS
-CPPUNIT_LIBS = 
-!endif
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -29,8 +29,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \
 	-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \
 	-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-	-DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+	-DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
@@ -2759,6 +2758,9 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+	cd ..\..\samples
+	$(MAKE) -f makefile.bcc $(MAKEARGS) clean
+	cd ..\..\..

 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -19,8 +19,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
 	USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
 	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-	VENDOR="$(VENDOR)" CFG="$(CFG)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-	CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+	VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
 	GCC_VERSION="$(GCC_VERSION)"
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -2784,6 +2783,7 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a
+	$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) clean

 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -20,7 +20,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_OPENGL="$(USE_OPENGL)" \
 	USE_ODBC="$(USE_ODBC)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 OBJS = \
 	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -3327,6 +3326,9 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+	cd ..\..\samples
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)

 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h

--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -2039,8 +2039,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
 	USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" &
 	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
-	VENDOR="$(VENDOR)" CFG="$(CFG)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" &
-	CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
+	VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
@@ -2870,6 +2869,9 @@ clean : .SYMBOLIC
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+	cd ..\..\samples
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+	cd $(WATCOM_CWD)

 setup_h : .SYMBOLIC $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h

--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.

-timestamp='2004-01-05'
+timestamp='2002-11-30'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -98,18 +98,14 @@ trap 'exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.

-# Portable tmp directory creation inspired by the Autoconf team.
+# This shell variable is my proudest work .. or something. --bje

-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
+(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
+   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
+dummy=$tmpdir/dummy ;
+files="$dummy.c $dummy.o $dummy.rel $dummy" ;
+trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
 ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
@@ -117,13 +113,15 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
+	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
 ,,*)   CC_FOR_BUILD=$CC ;;
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ;
+unset files'

 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -221,9 +219,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
    pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -243,52 +238,68 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
+	eval $set_cc_for_build
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	if test "$?" = 0 ; then
+		case `$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy && rmdir $tmpdir
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
    Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -310,9 +321,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -330,9 +338,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
    DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -445,7 +450,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 EOF
 	$CC_FOR_BUILD -o $dummy $dummy.c \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	rm -f $dummy.c $dummy && rmdir $tmpdir
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
    Motorola:PowerMAX_OS:*:*)
@@ -529,7 +535,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+		rm -f $dummy.c $dummy && rmdir $tmpdir
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -628,20 +635,10 @@ EOF
              }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy && rmdir $tmpdir
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
    ia64:HP-UX:*:*)
@@ -675,7 +672,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+	rm -f $dummy.c $dummy && rmdir $tmpdir
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -733,26 +731,21 @@ EOF
    CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
    CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -774,10 +767,8 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	rm -f $dummy.c && rmdir $tmpdir
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -788,8 +779,8 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:3*)
+	echo i586-pc-interix3
 	exit 0 ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -810,22 +801,14 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    *:GNU:*:*)
-	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
    arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -849,6 +832,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
    mips64:Linux:*:*)
@@ -868,6 +852,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
    ppc:Linux:*:*)
@@ -904,9 +889,6 @@ EOF
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
    sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -964,11 +946,9 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c && rmdir $tmpdir
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -997,9 +977,6 @@ EOF
    i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1071,7 +1048,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1169,11 +1146,7 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1186,7 +1159,7 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
    *:NonStop-UX:*:*)
@@ -1227,12 +1200,6 @@ EOF
    *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DRAGONFLY:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1353,7 +1320,8 @@ main ()
 }
 EOF

-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
+rm -f $dummy.c $dummy && rmdir $tmpdir

 # Apollos put the system type in the environment.

--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.

-timestamp='2004-01-05'
+timestamp='2001-09-07'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,8 +29,7 @@ timestamp='2004-01-05'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -118,8 +117,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -228,46 +226,32 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
-	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| openrisc \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| s390 | s390x \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| stormy16 | strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -294,56 +278,38 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
 	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| s390-* | s390x-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -377,12 +343,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -414,10 +374,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -438,8 +394,16 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | j90)
-		basic_machine=j90-cray
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -454,14 +418,6 @@ case $basic_machine in
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -642,6 +598,14 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -656,10 +620,6 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -732,10 +692,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -743,14 +699,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -773,55 +721,49 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-		;;
+	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-		;;
+	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -842,26 +784,10 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -869,10 +795,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
+	sparclite-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -939,42 +862,22 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
+		basic_machine=t3e-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -996,8 +899,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -1018,13 +921,17 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-	ymp)
-		basic_machine=ymp-cray
+	xmp)
+		basic_machine=xmp-cray
 		os=-unicos
 		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -1045,6 +952,13 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -1064,16 +978,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1088,6 +999,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1143,19 +1058,17 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -os2* | -vos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1167,10 +1080,8 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1179,9 +1090,6 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1194,9 +1102,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1215,23 +1120,14 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1243,9 +1139,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1273,14 +1166,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1313,14 +1200,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1347,9 +1230,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1413,19 +1293,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1494,16 +1374,10 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
--- a/1214
+++ b/1214
--- a/configure.in
+++ b/configure.in
@@ -165,8 +165,9 @@ case "${host}" in
    fi
    DEFAULT_DEFAULT_wxUSE_GTK=1
  ;;
-  *-*-gnu* | *-*-k*bsd*-gnu )
+  *-*-gnu* )
    USE_GNU=1
+    AC_DEFINE(__GNU__)
    TMP=`uname -m`
    if test "x$TMP" = "xalpha"; then
      USE_ALPHA=1
@@ -294,7 +295,7 @@ case "${host}" in
    DEFAULT_DEFAULT_wxUSE_PM=1
    dnl "c++" wrapper is not always available, so always use plain gcc.
    CXX=gcc
-    LDFLAGS="$LDFLAGS -Zcrtdll"
+    LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
    dnl
    dnl Some special code that's automatically added by autoconf-2.57 for OS/2
    dnl and hopefully also by autoconf-2.58 and newer on all other platforms.
@@ -675,7 +676,7 @@ else
  DEFAULT_wxUSE_CHECKLST=yes
  DEFAULT_wxUSE_CHOICE=yes
  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_DISPLAY=yes
+  DEFAULT_wxUSE_DISPLAY=no
  DEFAULT_wxUSE_GAUGE=yes
  DEFAULT_wxUSE_GRID=yes
  DEFAULT_wxUSE_IMAGLIST=yes
@@ -772,7 +773,6 @@ AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$wit
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)

 WX_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)], wxUSE_GTK2)
-WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)

 WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
 WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
@@ -799,9 +799,6 @@ WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code
 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
 WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
-if test "$USE_OS2" = "1"; then
-    WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
-fi

 if test "$wxUSE_DEBUG" = "yes"; then
  DEFAULT_wxUSE_DEBUG_FLAG=yes
@@ -1144,14 +1141,6 @@ dnl Path separator; ':' for unix, ';' for OS/2
 case "${host}" in
  *-pc-os2_emx | *-pc-os2-emx )
    PATH_IFS=';'
-    dnl Handle OMF support
-    if test "$wxUSE_OMF" = "yes"; then
-      AR=emxomfar
-      RANLIB=:
-      LDFLAGS="-Zomf $LDFLAGS"
-      CFLAGS="-Zomf $CFLAGS"
-      CXXFLAGS="-Zomf $CXXFLAGS"
-    fi
  ;;
  *)
    PATH_IFS=':'
@@ -1509,7 +1498,7 @@ case "${host}" in
          dnl Include resources for the "native" port (wxPM).
          RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
      fi
-      AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[
+      AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
          AC_TRY_COMPILE([],
              [
                  #if (__GNUC__ < 3)
@@ -1517,38 +1506,17 @@ case "${host}" in
                  #endif
              ],
              [
-                  AC_TRY_COMPILE([],
-                      [
-                          #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
-                              #error intermediate gcc
-                          #endif
-                      ],
-                      [
-                         wx_cv_gccversion=Innotek
-                      ],
-                      [
-                         wx_cv_gccversion=3
-                      ]
-                  )
+                  wx_cv_gcc3=yes
              ],
              [
-                  wx_cv_gccversion=2
+                  wx_cv_gcc3=no
              ]
          )
      ])
-      if test "$wx_cv_gccversion" = "2"; then
+      if test "$wx_cv_gcc3" = "no"; then
          LIBS="$LIBS -lstdcpp"
-          LDFLAGS="$LDFLAGS -Zsysv-signals"
      else
-          if test "$wx_cv_gccversion" = "3"; then
-              LIBS="$LIBS -lstdcxx"
-              LDFLAGS="$LDFLAGS -Zsysv-signals"
-          else
-              LIBS="$LIBS -lstdc++"
-          fi
-      fi
-      if test "$wxUSE_OMF" = "yes"; then
-        LDFLAGS="$LDFLAGS -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+          LIBS="$LIBS -lstdcxx"
      fi
      dnl (end of OS/2-only piece)
  ;;
@@ -1877,8 +1845,6 @@ SEARCH_INCLUDE="\
    /usr/include/qt           \
    /usr/local/include/qt     \
                              \
-    /usr/local/arm/3.3.2/include     \
-                              \
    /usr/include/windows      \
    /usr/include/wine         \
    /usr/local/include/wine   \
@@ -2363,7 +2329,6 @@ if test "$wxUSE_GUI" = "yes"; then
    WXGTK12=
    WXGTK127=
    WXGTK20=
-    WXGPE=

    if test "$wxUSE_MSW" = 1 ; then
        TOOLKIT=MSW
@@ -2480,33 +2445,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.

        dnl test for XIM support in libgdk
        AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
-        
-        
-        dnl test for external libxpm if we're configured to use it
-        if test "$wxUSE_GPE" = "yes"; then
-            AC_MSG_CHECKING(for gpewidget library)
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
-            if test "$ac_find_libraries" != "" ; then
-                WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-                dnl -lgpewidget must be before all GTK libs and
-                dnl we guess its path from the prefix
-                GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
-                WXGPE=1
-                AC_MSG_RESULT(found at $ac_find_libraries)
-            else
-                AC_MSG_RESULT(not found)
-            fi
-
-            dnl AC_MSG_CHECKING(for gpe library)
-            dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
-            dnl if test "$ac_find_libraries" != "" ; then
-            dnl     WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-            dnl     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
-            dnl     AC_MSG_RESULT(found at $ac_find_libraries)
-            dnl else
-            dnl     AC_MSG_RESULT(not found)
-            dnl fi
-        fi
    fi

    if test "$wxUSE_MGL" = 1; then
@@ -3305,6 +3243,7 @@ dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---

 if test "$wxUSE_SHARED" = "yes"; then
    case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx | \
      *-pc-msdosdjgpp )
        dnl only static for now
        wxUSE_SHARED=no
@@ -4317,10 +4256,6 @@ if test "$WXGTK127" = 1 ; then
  AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127)
 fi

-if test "$WXGPE" = 1 ; then
-  AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE)
-fi
-
 WXDEBUG=

 if test "$wxUSE_DEBUG_INFO" = "yes" ; then
@@ -5033,6 +4968,7 @@ if test "$wxUSE_GUI" = "yes"; then
 fi


+
 dnl ---------------------------------------------------------------------------
 dnl String stuff
 dnl ---------------------------------------------------------------------------
@@ -5232,14 +5168,11 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then

    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
        AC_DEFINE(wxUSE_DRAG_AND_DROP)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
    fi

 fi

-if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
-fi
-
 if test "$wxUSE_SPLINES" = "yes" ; then
  AC_DEFINE(wxUSE_SPLINES)
 fi
@@ -5433,7 +5366,7 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
 fi

 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
        AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
        wxUSE_TOGGLEBTN=no
    fi
@@ -5969,8 +5902,6 @@ AC_SUBST(TOOLKIT_VERSION)
 AC_SUBST(SAMPLES_RPATH_FLAG)
 AC_SUBST(SAMPLES_RPATH_POSTLINK)
 AC_SUBST(HOST_SUFFIX)
-AC_SUBST(CPPUNIT_CFLAGS)
-AC_SUBST(CPPUNIT_LIBS)

 AC_BAKEFILE

@@ -6183,8 +6114,6 @@ else dnl we build wxBase only
    dnl there are no wxBase programs in contrib nor demos
    SUBDIRS="samples utils"
 fi
-dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
-AM_PATH_CPPUNIT(1.8.0, SUBDIRS="$SUBDIRS tests")

 for subdir in `echo $SUBDIRS`; do
    if test -d ${srcdir}/${subdir} ; then
@@ -6206,13 +6135,11 @@ for subdir in `echo $SUBDIRS`; do
            dnl wxBase
            if test ${subdir} = "samples"; then
                makefiles="samples/Makefile.in samples/console/Makefile.in"
-            elif test ${subdir} = "utils"; then
+            else dnl utils
                makefiles="utils/HelpGen/Makefile.in \
                           utils/HelpGen/src/Makefile.in \
                           utils/tex2rtf/Makefile.in \
                           utils/tex2rtf/src/Makefile.in"
-            else dnl assume that everything compiles for tests
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
            fi
        fi

--- a/contrib/include/wx/deprecated/propform.h
+++ b/contrib/include/wx/deprecated/propform.h
@@ -131,7 +131,7 @@ class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
   // Called to check value is OK (e.g. when OK is pressed)
   // Return FALSE if value didn't check out; signal to restore old value.
   virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow) ) { return true; }
+     wxWindow *WXUNUSED(parentWindow) ) { return TRUE; }

   // Does the transferance from the property editing area to the property itself.
   // Called by the view, e.g. when closing the window.
@@ -279,7 +279,7 @@ public:
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxString& name = _T("panel"))
-        : wxPanel(parent, wxID_ANY, pos, size, style, name)
+        : wxPanel(parent, -1, pos, size, style, name)
        {
            m_view = v;
        }
@@ -311,7 +311,7 @@ public:
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& name = _T("frame"))
-        : wxFrame(parent, wxID_ANY, title, pos, size, style, name)
+        : wxFrame(parent, -1, title, pos, size, style, name)
        {
            m_view = v;
            m_propertyPanel = NULL;
--- a/contrib/include/wx/deprecated/proplist.h
+++ b/contrib/include/wx/deprecated/proplist.h
@@ -97,14 +97,14 @@ public:
  virtual bool UpdatePropertyDisplayInList(wxProperty *property);

  // Update the whole list
-  virtual bool UpdatePropertyList(bool clearEditArea = true);
+  virtual bool UpdatePropertyList(bool clearEditArea = TRUE);

  // Find the wxListBox index corresponding to this property
  virtual int FindListIndexForProperty(wxProperty *property);

  // Select and show string representation in editor the given
  // property. NULL resets to show no property.
-  virtual bool ShowProperty(wxProperty *property, bool select = true);
+  virtual bool ShowProperty(wxProperty *property, bool select = TRUE);
  virtual bool EditProperty(wxProperty *property);

  // Update the display from the property
@@ -200,7 +200,7 @@ class WXDLLIMPEXP_DEPRECATED wxPropertyTextEdit: public wxTextCtrl
 public:
    wxPropertyTextEdit(wxPropertyListView *v = NULL,
                       wxWindow *parent = NULL,
-                       const wxWindowID id = wxID_ANY,
+                       const wxWindowID id = -1,
                       const wxString& value = wxEmptyString,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
@@ -236,7 +236,7 @@ public:
   // cycling through possible values.
   inline virtual bool OnDoubleClick(
     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
+     { return TRUE; }

   // Called when the value listbox is selected. Default behaviour is to copy
   // string to text control, and retrieve the value into the property.
@@ -245,19 +245,19 @@ public:
   // Called when the property value is edited using standard text control
   inline virtual bool OnPrepareControls(
     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
+     { return TRUE; }

   virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);

      // Called when the property is edited in detail
   inline virtual bool OnPrepareDetailControls(
     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
+     { return TRUE; }

   // Called if focus lost, IF we're in a modeless property editing situation.
   inline virtual bool OnClearDetailControls(
     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
+     { return TRUE; }

   // Called when the edit (...) button is pressed. The default implementation
   // calls view->BeginDetailedEditing; the filename validator (for example) overrides
@@ -268,7 +268,7 @@ public:
   // Return FALSE if value didn't check out; signal to restore old value.
   inline virtual bool OnCheckValue(
     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
+     { return TRUE; }

   // Called when TICK is pressed or focus is lost or view wants to update
   // the property list.
@@ -324,7 +324,7 @@ public:
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxString& name = wxT("panel"))
-        : wxPanel(parent, wxID_ANY, pos, size, style, name)
+        : wxPanel(parent, -1, pos, size, style, name)
        {
            m_view = v;
        }
@@ -362,7 +362,7 @@ public:
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& name = _T("frame"))
-        : wxFrame(parent, wxID_ANY, title, pos, size, style, name)
+        : wxFrame(parent, -1, title, pos, size, style, name)
        {
            m_view = v;
            m_propertyPanel = NULL;
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1206,9 +1206,6 @@
 #define wxSTC_CMD_VCHOMEWRAP 2453
 #define wxSTC_CMD_VCHOMEWRAPEXTEND 2454

-// Copy the line containing the caret.
-#define wxSTC_CMD_LINECOPY 2455
-
 // Move to the previous change in capitalisation.
 #define wxSTC_CMD_WORDPARTLEFT 2390

@@ -2130,147 +2127,9 @@ public:
    void SetFoldMarginColour(bool useSetting, const wxColour& back);
    void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);

-    // Move caret down one line.
-    void LineDown();
-
-    // Move caret down one line extending selection to new caret position.
-    void LineDownExtend();
-
-    // Move caret up one line.
-    void LineUp();
-
-    // Move caret up one line extending selection to new caret position.
-    void LineUpExtend();
-
-    // Move caret left one character.
-    void CharLeft();
-
-    // Move caret left one character extending selection to new caret position.
-    void CharLeftExtend();
-
-    // Move caret right one character.
-    void CharRight();
-
-    // Move caret right one character extending selection to new caret position.
-    void CharRightExtend();
-
-    // Move caret left one word.
-    void WordLeft();
-
-    // Move caret left one word extending selection to new caret position.
-    void WordLeftExtend();
-
-    // Move caret right one word.
-    void WordRight();
-
-    // Move caret right one word extending selection to new caret position.
-    void WordRightExtend();
-
-    // Move caret to first position on line.
-    void Home();
-
-    // Move caret to first position on line extending selection to new caret position.
-    void HomeExtend();
-
-    // Move caret to last position on line.
-    void LineEnd();
-
-    // Move caret to last position on line extending selection to new caret position.
-    void LineEndExtend();
-
-    // Move caret to first position in document.
-    void DocumentStart();
-
-    // Move caret to first position in document extending selection to new caret position.
-    void DocumentStartExtend();
-
-    // Move caret to last position in document.
-    void DocumentEnd();
-
-    // Move caret to last position in document extending selection to new caret position.
-    void DocumentEndExtend();
-
-    // Move caret one page up.
-    void PageUp();
-
-    // Move caret one page up extending selection to new caret position.
-    void PageUpExtend();
-
-    // Move caret one page down.
-    void PageDown();
-
-    // Move caret one page down extending selection to new caret position.
-    void PageDownExtend();
-
-    // Switch from insert to overtype mode or the reverse.
-    void EditToggleOvertype();
-
-    // Cancel any modes such as call tip or auto-completion list display.
-    void Cancel();
-
-    // Delete the selection or if no selection, the character before the caret.
-    void DeleteBack();
-
-    // If selection is empty or all on one line replace the selection with a tab character.
-    // If more than one line selected, indent the lines.
-    void Tab();
-
-    // Dedent the selected lines.
-    void BackTab();
-
-    // Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-    void NewLine();
-
-    // Insert a Form Feed character.
-    void FormFeed();
-
-    // Move caret to before first visible character on line.
-    // If already there move to first character on line.
-    void VCHome();
-
-    // Like VCHome but extending selection to new caret position.
-    void VCHomeExtend();
-
-    // Magnify the displayed text by increasing the sizes by 1 point.
-    void ZoomIn();
-
-    // Make the displayed text smaller by decreasing the sizes by 1 point.
-    void ZoomOut();
-
-    // Delete the word to the left of the caret.
-    void DelWordLeft();
-
-    // Delete the word to the right of the caret.
-    void DelWordRight();
-
-    // Cut the line containing the caret.
-    void LineCut();
-
-    // Delete the line containing the caret.
-    void LineDelete();
-
-    // Switch the current line with the previous.
-    void LineTranspose();
-
    // Duplicate the current line.
    void LineDuplicate();

-    // Transform the selection to lower case.
-    void LowerCase();
-
-    // Transform the selection to upper case.
-    void UpperCase();
-
-    // Scroll the document down, keeping the caret visible.
-    void LineScrollDown();
-
-    // Scroll the document up, keeping the caret visible.
-    void LineScrollUp();
-
-    // Delete the selection or if no selection, the character before the caret.
-    // Will not delete the character before at the start of a line.
-    void DeleteBackNotLine();
-
    // Move caret to first position on display line.
    void HomeDisplay();

@@ -2285,18 +2144,6 @@ public:
    // caret position.
    void LineEndDisplayExtend();

-    // These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-    // except they behave differently when word-wrap is enabled:
-    // They go first to the start / end of the display line, like (Home|LineEnd)Display
-    // The difference is that, the cursor is already at the point, it goes on to the start
-    // or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-    void HomeWrap();
-    void HomeWrapExtend();
-    void LineEndWrap();
-    void LineEndWrapExtend();
-    void VCHomeWrap();
-    void VCHomeWrapExtend();
-
    // Copy the line containing the caret.
    void LineCopy();

@@ -2479,12 +2326,6 @@ public:
    // Limit hotspots to single line so hotspots on two lines don't merge.
    void SetHotspotSingleLine(bool singleLine);

-    // Move caret between paragraphs (delimited by empty lines).
-    void ParaDown();
-    void ParaDownExtend();
-    void ParaUp();
-    void ParaUpExtend();
-
    // Given a valid document position, return the previous position taking code
    // page into account. Returns 0 if passed 0.
    int PositionBefore(int pos);
@@ -2512,59 +2353,6 @@ public:
    // Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
    int GetLineSelEndPosition(int line);

-    // Move caret down one line, extending rectangular selection to new caret position.
-    void LineDownRectExtend();
-
-    // Move caret up one line, extending rectangular selection to new caret position.
-    void LineUpRectExtend();
-
-    // Move caret left one character, extending rectangular selection to new caret position.
-    void CharLeftRectExtend();
-
-    // Move caret right one character, extending rectangular selection to new caret position.
-    void CharRightRectExtend();
-
-    // Move caret to first position on line, extending rectangular selection to new caret position.
-    void HomeRectExtend();
-
-    // Move caret to before first visible character on line.
-    // If already there move to first character on line.
-    // In either case, extend rectangular selection to new caret position.
-    void VCHomeRectExtend();
-
-    // Move caret to last position on line, extending rectangular selection to new caret position.
-    void LineEndRectExtend();
-
-    // Move caret one page up, extending rectangular selection to new caret position.
-    void PageUpRectExtend();
-
-    // Move caret one page down, extending rectangular selection to new caret position.
-    void PageDownRectExtend();
-
-    // Move caret to top of page, or one page up if already at top of page.
-    void StutteredPageUp();
-
-    // Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-    void StutteredPageUpExtend();
-
-    // Move caret to bottom of page, or one page down if already at bottom of page.
-    void StutteredPageDown();
-
-    // Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-    void StutteredPageDownExtend();
-
-    // Move caret left one word, position cursor at end of word.
-    void WordLeftEnd();
-
-    // Move caret left one word, position cursor at end of word, extending selection to new caret position.
-    void WordLeftEndExtend();
-
-    // Move caret right one word, position cursor at end of word.
-    void WordRightEnd();
-
-    // Move caret right one word, position cursor at end of word, extending selection to new caret position.
-    void WordRightEndExtend();
-
    // Set the set of characters making up whitespace for when moving or selecting by word.
    // Should be called after SetWordChars.
    void SetWhitespaceChars(const wxString& characters);
--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ b/contrib/samples/deprecated/proplist/proplist.cpp
@@ -72,11 +72,11 @@ bool MyApp::OnInit(void)
  m_mainFrame->SetMenuBar(menu_bar);

  m_mainFrame->Centre(wxBOTH);
-  m_mainFrame->Show(true);
+  m_mainFrame->Show(TRUE);

  SetTopWindow(m_mainFrame);
    
-  return true;
+  return TRUE;
 }

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -91,7 +91,7 @@ END_EVENT_TABLE()

 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, long type):
-  wxFrame(frame, wxID_ANY, title, pos, size, type)
+  wxFrame(frame, -1, title, pos, size, type)
 {
 }

@@ -101,7 +101,7 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
    if (wxGetApp().m_childWindow)
    {
-        wxGetApp().m_childWindow->Close(true);
+        wxGetApp().m_childWindow->Close(TRUE);
    }

    Destroy();
@@ -109,27 +109,27 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(true);
+    Close(TRUE);
 }

 void MyFrame::OnDialogList(wxCommandEvent& WXUNUSED(event))
 {
-    wxGetApp().PropertyListTest(true);
+    wxGetApp().PropertyListTest(TRUE);
 }

 void MyFrame::OnFrameList(wxCommandEvent& WXUNUSED(event))
 {
-    wxGetApp().PropertyListTest(false);
+    wxGetApp().PropertyListTest(FALSE);
 }

 void MyFrame::OnDialogForm(wxCommandEvent& WXUNUSED(event))
 {
-    wxGetApp().PropertyFormTest(true);
+    wxGetApp().PropertyFormTest(TRUE);
 }

 void MyFrame::OnFrameForm(wxCommandEvent& WXUNUSED(event))
 {
-    wxGetApp().PropertyFormTest(false);
+    wxGetApp().PropertyFormTest(FALSE);
 }

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -159,7 +159,7 @@ void MyApp::PropertyListTest(bool useDialog)
    wxPropertySheet *sheet = new wxPropertySheet;

    sheet->AddProperty(new wxProperty(_T("fred"), 1.0, _T("real")));
-    sheet->AddProperty(new wxProperty(_T("tough choice"), true, _T("bool")));
+    sheet->AddProperty(new wxProperty(_T("tough choice"), (bool)TRUE, _T("bool")));
    sheet->AddProperty(new wxProperty(_T("ian"), (long)45, _T("integer"), new wxIntegerListValidator(-50, 50)));
    sheet->AddProperty(new wxProperty(_T("bill"), 25.0, _T("real"), new wxRealListValidator(0.0, 100.0)));
    sheet->AddProperty(new wxProperty(_T("julian"), _T("one"), _T("string")));
@@ -174,21 +174,20 @@ void MyApp::PropertyListTest(bool useDialog)
        (
            NULL,
            wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL | wxPROP_BUTTON_CHECK_CROSS
-            | wxPROP_DYNAMIC_VALUE_FIELD | wxPROP_PULLDOWN | wxPROP_SHOWVALUES
+            |wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN|wxPROP_SHOWVALUES
        );

-    PropListDialog *propDialog = NULL;
-    PropListFrame *propFrame = NULL;
+    wxDialog *propDialog = NULL;
+    wxPropertyListFrame *propFrame = NULL;
    if (useDialog)
    {
        propDialog = new PropListDialog(view, NULL, _T("Property Sheet Test"),
-            wxDefaultPosition, wxSize(400, 500), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODELESS);
+        wxPoint(-1, -1), wxSize(400, 500), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODELESS);
        m_childWindow = propDialog;
    }
    else
    {
-        propFrame = new PropListFrame(view, NULL, _T("Property Sheet Test"),
-            wxDefaultPosition, wxSize(400, 500));
+        propFrame = new PropListFrame(view, NULL, _T("Property Sheet Test"), wxPoint(-1, -1), wxSize(400, 500));
        m_childWindow = propFrame;
    }

@@ -197,15 +196,17 @@ void MyApp::PropertyListTest(bool useDialog)
    if (useDialog)
    {
        view->ShowView(sheet, (wxPanel *)propDialog);
+        propDialog->Centre(wxBOTH);
+        propDialog->Show(TRUE);
    }
    else
    {
        propFrame->Initialize();
        view->ShowView(sheet, propFrame->GetPropertyPanel());
-    }

-    m_childWindow->Centre(wxBOTH);
-    m_childWindow->Show(true);
+        propFrame->Centre(wxBOTH);
+        propFrame->Show(TRUE);
+    }
 }

 void MyApp::PropertyFormTest(bool useDialog)
@@ -216,7 +217,7 @@ void MyApp::PropertyFormTest(bool useDialog)
    wxPropertySheet *sheet = new wxPropertySheet;

    sheet->AddProperty(new wxProperty(_T("fred"), 25.0, _T("real"), new wxRealFormValidator(0.0, 100.0)));
-    sheet->AddProperty(new wxProperty(_T("tough choice"), true, _T("bool")));
+    sheet->AddProperty(new wxProperty(_T("tough choice"), (bool)TRUE, _T("bool")));
    sheet->AddProperty(new wxProperty(_T("ian"), (long)45, _T("integer"), new wxIntegerFormValidator(-50, 50)));
    sheet->AddProperty(new wxProperty(_T("julian"), _T("one"), _T("string")));
    wxStringList *strings = new wxStringList(wxT("one"), wxT("two"), wxT("three"), NULL);
@@ -230,13 +231,13 @@ void MyApp::PropertyFormTest(bool useDialog)
    if (useDialog)
    {
        propDialog = new PropFormDialog(view, NULL, _T("Property Form Test"),
-            wxDefaultPosition, wxSize(380, 250), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL);
+        wxPoint(-1, -1), wxSize(380, 250), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL);
        m_childWindow = propDialog;
    }
    else
    {
        propFrame = new PropFormFrame(view, NULL, _T("Property Form Test"),
-            wxDefaultPosition, wxSize(380, 250));
+            wxPoint(-1, -1), wxSize(380, 250));
        propFrame->Initialize();
        m_childWindow = propFrame;
    }
@@ -268,13 +269,13 @@ void MyApp::PropertyFormTest(bool useDialog)
 #endif
 
    // Add items to the panel
-    wxButton *okButton = new wxButton(panel, wxID_OK, _T("OK"), wxDefaultPosition,
+    wxButton *okButton = new wxButton(panel, wxID_OK, _T("OK"), wxPoint(-1, -1),
        wxSize(80, 26), 0, wxDefaultValidator, _T("ok"));
-    wxButton *cancelButton = new wxButton(panel, wxID_CANCEL, _T("Cancel"),  wxDefaultPosition,
+    wxButton *cancelButton = new wxButton(panel, wxID_CANCEL, _T("Cancel"),  wxPoint(-1, -1),
        wxSize(80, 26), 0, wxDefaultValidator, _T("cancel"));
-    wxButton *updateButton = new wxButton(panel, wxID_PROP_UPDATE, _T("Update"),  wxDefaultPosition,
+    wxButton *updateButton = new wxButton(panel, wxID_PROP_UPDATE, _T("Update"),  wxPoint(-1, -1),
        wxSize(80, 26), 0, wxDefaultValidator, _T("update"));
-    wxButton *revertButton = new wxButton(panel, wxID_PROP_REVERT, _T("Revert"),  wxDefaultPosition,
+    wxButton *revertButton = new wxButton(panel, wxID_PROP_REVERT, _T("Revert"),  wxPoint(-1, -1),
        wxSize(80, 26), 0, wxDefaultValidator, _T("revert"));

    c = new wxLayoutConstraints;
@@ -306,8 +307,8 @@ void MyApp::PropertyFormTest(bool useDialog)
    okButton->SetConstraints(c);

    // The name of this text item matches the "fred" property
-    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition, 
-        wxSize( 200, wxDefaultSize.y), 0, wxDefaultValidator, _T("fred"));
+    wxTextCtrl *text = new wxTextCtrl(panel, -1, _T("Fred"), wxPoint(-1, -1), wxSize(
+    200, -1), 0, wxDefaultValidator, _T("fred"));

    c = new wxLayoutConstraints;
    c->left.SameAs(panel, wxLeft, 4);
@@ -316,8 +317,8 @@ void MyApp::PropertyFormTest(bool useDialog)
    c->width.AsIs();
    text->SetConstraints(c);

-    wxCheckBox *checkBox = new wxCheckBox(panel, wxID_ANY, _T("Yes or no"), wxDefaultPosition,
-        wxDefaultSize, 0, wxDefaultValidator, _T("tough choice"));
+    wxCheckBox *checkBox = new wxCheckBox(panel, -1, _T("Yes or no"), wxPoint(-1, -1),
+        wxSize(-1, -1), 0, wxDefaultValidator, _T("tough choice"));

    c = new wxLayoutConstraints;
    c->left.SameAs(text, wxRight, 20);
@@ -326,7 +327,7 @@ void MyApp::PropertyFormTest(bool useDialog)
    c->width.AsIs();
    checkBox->SetConstraints(c);

-    wxSlider *slider = new wxSlider(panel, wxID_ANY, -50, 50, 150, wxDefaultPosition,
+  wxSlider *slider = new wxSlider(panel, -1, -50, 50, 150, wxPoint(-1, -1),
    wxSize(200,10), 0, wxDefaultValidator, _T("ian"));

    c = new wxLayoutConstraints;
@@ -336,7 +337,7 @@ void MyApp::PropertyFormTest(bool useDialog)
    c->width.AsIs();
    slider->SetConstraints(c);

-    wxListBox *listBox = new wxListBox(panel, wxID_ANY, wxDefaultPosition,
+    wxListBox *listBox = new wxListBox(panel, -1, wxPoint(-1, -1),
        wxSize(200, 100), 0, NULL, 0, wxDefaultValidator, _T("constrained"));

    c = new wxLayoutConstraints;
@@ -348,7 +349,7 @@ void MyApp::PropertyFormTest(bool useDialog)

    view->AddRegistry(&myFormValidatorRegistry);

-    panel->SetAutoLayout(true);
+    panel->SetAutoLayout(TRUE);

    view->ShowView(sheet, panel);
    view->AssociateNames();
@@ -356,13 +357,15 @@ void MyApp::PropertyFormTest(bool useDialog)

    if (useDialog) {
        propDialog->Layout();
+        propDialog->Centre(wxBOTH);
+        propDialog->Show(TRUE);
    }
    else
    {
        // panel->Layout();
+        propFrame->Centre(wxBOTH);
+        propFrame->Show(TRUE);
    }
-    m_childWindow->Centre(wxBOTH);
-    m_childWindow->Show(true);
 }

 BEGIN_EVENT_TABLE(PropListFrame, wxPropertyListFrame)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -292,13 +292,13 @@ bool wxAnimationPlayer::PlayFrame()
 // Clear the wxImage cache
 void wxAnimationPlayer::ClearCache()
 {
-    wxList::compatibility_iterator node = m_frames.GetFirst();
+    wxNode* node = m_frames.GetFirst();
    while (node)
    {
-        wxList::compatibility_iterator next = node->GetNext();
+        wxNode* next = node->GetNext();
        wxBitmap* bitmap = (wxBitmap*) node->GetData();
        delete bitmap;
-        m_frames.Erase(node);
+        delete node;
        node = next;
    }
 }
@@ -369,7 +369,7 @@ void wxAnimationPlayer::DrawFrame(int frame, wxDC& dc, const wxPoint& pos)
 {
    wxASSERT_MSG( (m_animation != NULL), _T("Animation not present in wxAnimationPlayer"));
    wxASSERT_MSG( (m_frames.GetCount() != 0), _T("Animation cache not present in wxAnimationPlayer"));
-    wxASSERT_MSG( !!m_frames.Item(frame), _T("Image not present in wxAnimationPlayer::DrawFrame"));
+    wxASSERT_MSG( (m_frames.Item(frame) != (wxNode*) NULL), _T("Image not present in wxAnimationPlayer::DrawFrame"));

    wxBitmap* bitmap = (wxBitmap*) m_frames.Item(frame)->GetData() ;

--- a/contrib/src/deprecated/propform.cpp
+++ b/contrib/src/deprecated/propform.cpp
@@ -53,7 +53,7 @@ EVT_BUTTON(wxID_PROP_REVERT, wxPropertyFormView::OnRevert)
 EVT_BUTTON(wxID_PROP_UPDATE, wxPropertyFormView::OnUpdate)
 END_EVENT_TABLE()

-bool wxPropertyFormView::sm_dialogCancelled = false;
+bool wxPropertyFormView::sm_dialogCancelled = FALSE;

 wxPropertyFormView::wxPropertyFormView(wxWindow *propPanel, long flags):wxPropertyView(flags)
 {
@@ -64,7 +64,7 @@ wxPropertyFormView::wxPropertyFormView(wxWindow *propPanel, long flags):wxProper
    m_windowCancelButton = NULL;
    m_windowHelpButton = NULL;

-    m_detailedEditing = false;
+    m_detailedEditing = FALSE;
 }

 wxPropertyFormView::~wxPropertyFormView(void)
@@ -84,13 +84,13 @@ void wxPropertyFormView::ShowView(wxPropertySheet *ps, wxWindow *panel)
 // the object itself.
 bool wxPropertyFormView::OnUpdateView(void)
 {
-    return true;
+    return TRUE;
 }

 bool wxPropertyFormView::Check(void)
 {
    if (!m_propertySheet)
-        return false;
+        return FALSE;

    wxNode *node = m_propertySheet->GetProperties().GetFirst();
    while (node)
@@ -101,17 +101,17 @@ bool wxPropertyFormView::Check(void)
        {
            wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
            if (!formValidator->OnCheckValue(prop, this, m_propertyWindow))
-                return false;
+                return FALSE;
        }
        node = node->GetNext();
    }
-    return true;
+    return TRUE;
 }

 bool wxPropertyFormView::TransferToPropertySheet(void)
 {
    if (!m_propertySheet)
-        return false;
+        return FALSE;

    wxNode *node = m_propertySheet->GetProperties().GetFirst();
    while (node)
@@ -125,13 +125,13 @@ bool wxPropertyFormView::TransferToPropertySheet(void)
        }
        node = node->GetNext();
    }
-    return true;
+    return TRUE;
 }

 bool wxPropertyFormView::TransferToDialog(void)
 {
    if (!m_propertySheet)
-        return false;
+        return FALSE;

    wxNode *node = m_propertySheet->GetProperties().GetFirst();
    while (node)
@@ -145,13 +145,13 @@ bool wxPropertyFormView::TransferToDialog(void)
        }
        node = node->GetNext();
    }
-    return true;
+    return TRUE;
 }

 bool wxPropertyFormView::AssociateNames(void)
 {
    if (!m_propertySheet || !m_propertyWindow)
-        return false;
+        return FALSE;

    wxWindowList::Node  *node = m_propertyWindow->GetChildren().GetFirst();
    while (node)
@@ -165,7 +165,7 @@ bool wxPropertyFormView::AssociateNames(void)
        }
        node = node->GetNext();
    }
-    return true;
+    return TRUE;
 }


@@ -176,7 +176,7 @@ bool wxPropertyFormView::OnClose(void)
        ((wxPropertyFormPanel*)m_propertyWindow)->SetView(NULL);
    }
    delete this;
-    return true;
+    return TRUE;
 }

 void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event))
@@ -185,17 +185,17 @@ void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event))
    if (!Check())
        return;

-    sm_dialogCancelled = false;
+    sm_dialogCancelled = FALSE;
    TransferToPropertySheet();

-    m_managedWindow->Close(true);
+    m_managedWindow->Close(TRUE);
 }

 void wxPropertyFormView::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-    sm_dialogCancelled = true;
+    sm_dialogCancelled = TRUE;

-    m_managedWindow->Close(true);
+    m_managedWindow->Close(TRUE);
 }

 void wxPropertyFormView::OnHelp(wxCommandEvent& WXUNUSED(event))
@@ -257,14 +257,14 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
 bool wxPropertyFormView::ProcessEvent(wxEvent& event)
 {
    if (wxEvtHandler::ProcessEvent(event))
-        return true;
+        return TRUE;
    else if (event.IsCommandEvent() && !event.IsKindOf(CLASSINFO(wxUpdateUIEvent)) && event.GetEventObject())
    {
        OnCommand(* ((wxWindow*) event.GetEventObject()), (wxCommandEvent&) event);
-        return true;
+        return TRUE;
    }
    else
-        return false;
+        return FALSE;
 }

 void wxPropertyFormView::OnDoubleClick(wxControl *item)
@@ -303,12 +303,12 @@ END_EVENT_TABLE()

 wxPropertyFormDialog::wxPropertyFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
                                           const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-wxDialog(parent, wxID_ANY, title, pos, size, style, name)
+wxDialog(parent, -1, title, pos, size, style, name)
 {
    m_view = v;
    m_view->AssociatePanel(this);
    m_view->SetManagedWindow(this);
-    //  SetAutoLayout(true);
+    //  SetAutoLayout(TRUE);
 }

 void wxPropertyFormDialog::OnCloseWindow(wxCloseEvent& event)
@@ -340,7 +340,7 @@ bool wxPropertyFormDialog::ProcessEvent(wxEvent& event)
    if ( !m_view || ! m_view->ProcessEvent(event) )
        return wxEvtHandler::ProcessEvent(event);
    else
-        return true;
+        return TRUE;
 }


@@ -366,7 +366,7 @@ bool wxPropertyFormPanel::ProcessEvent(wxEvent& event)
    if ( !m_view || ! m_view->ProcessEvent(event) )
        return wxEvtHandler::ProcessEvent(event);
    else
-        return true;
+        return TRUE;
 }

 /*
@@ -399,10 +399,10 @@ bool wxPropertyFormFrame::Initialize(void)
    {
        m_view->AssociatePanel(m_propertyPanel);
        m_view->SetManagedWindow(this);
-        return true;
+        return TRUE;
    }
    else
-        return false;
+        return FALSE;
 }

 /*
@@ -425,12 +425,12 @@ bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView
                                       wxWindow *parentWindow)
 {
    if (m_realMin == 0.0 && m_realMax == 0.0)
-        return true;
+        return TRUE;

    // The item used for viewing the real number: should be a text item.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-        return false;
+        return FALSE;

    wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());

@@ -440,7 +440,7 @@ bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView
        wxChar buf[200];
        wxSprintf(buf, wxT("Value %s is not a valid real number!"), (const wxChar *)value);
        wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-        return false;
+        return FALSE;
    }

    if (val < m_realMin || val > m_realMax)
@@ -448,9 +448,9 @@ bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView
        wxChar buf[200];
        wxSprintf(buf, wxT("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
        wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-        return false;
+        return FALSE;
    }
-    return true;
+    return TRUE;
 }

 bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -459,16 +459,16 @@ bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormVi
    // The item used for viewing the real number: should be a text item.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-        return false;
+        return FALSE;

    wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());

    if (value.Length() == 0)
-        return false;
+        return FALSE;

    float f = (float)wxAtof((const wxChar *)value);
    property->GetValue() = f;
-    return true;
+    return TRUE;
 }

 bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -477,11 +477,11 @@ bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormVie
    // The item used for viewing the real number: should be a text item.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-        return false;
+        return FALSE;

    wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
    textItem->SetValue(FloatToString(property->GetValue().RealValue()));
-    return true;
+    return TRUE;
 }

 ///
@@ -493,12 +493,12 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi
                                          wxWindow *parentWindow)
 {
    if (m_integerMin == 0.0 && m_integerMax == 0.0)
-        return true;
+        return TRUE;

    // The item used for viewing the real number: should be a text item or a slider
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow)
-        return false;
+        return FALSE;

    long val = 0;

@@ -511,7 +511,7 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi
            wxChar buf[200];
            wxSprintf(buf, wxT("Value %s is not a valid integer!"), (const wxChar *)value);
            wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-            return false;
+            return FALSE;
        }
    }
    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
@@ -519,16 +519,16 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi
        val = (long)((wxSlider *)m_propertyWindow)->GetValue();
    }
    else
-        return false;
+        return FALSE;

    if (val < m_integerMin || val > m_integerMax)
    {
        wxChar buf[200];
        wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
        wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-        return false;
+        return FALSE;
    }
-    return true;
+    return TRUE;
 }

 bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -537,14 +537,14 @@ bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFor
    // The item used for viewing the real number: should be a text item or a slider
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow)
-        return false;
+        return FALSE;

    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
    {
        wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());

        if (value.Length() == 0)
-            return false;
+            return FALSE;

        long i = wxAtol((const wxChar *)value);
        property->GetValue() = i;
@@ -554,9 +554,9 @@ bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFor
        property->GetValue() = (long)((wxSlider *)m_propertyWindow)->GetValue();
    }
    else
-        return false;
+        return FALSE;

-    return true;
+    return TRUE;
 }

 bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -565,7 +565,7 @@ bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFor
    // The item used for viewing the real number: should be a text item or a slider
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow)
-        return false;
+        return FALSE;

    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
    {
@@ -577,8 +577,8 @@ bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFor
        ((wxSlider *)m_propertyWindow)->SetValue((int)property->GetValue().IntegerValue());
    }
    else
-        return false;
-    return true;
+        return FALSE;
+    return TRUE;
 }

 ///
@@ -592,9 +592,9 @@ bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView
    // The item used for viewing the boolean: should be a checkbox
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
-        return false;
+        return FALSE;

-    return true;
+    return TRUE;
 }

 bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -603,12 +603,12 @@ bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormVi
    // The item used for viewing the boolean: should be a checkbox.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
-        return false;
+        return FALSE;

    wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;

    property->GetValue() = (bool)checkBox->GetValue();
-    return true;
+    return TRUE;
 }

 bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -617,11 +617,11 @@ bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormVie
    // The item used for viewing the boolean: should be a checkbox.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
-        return false;
+        return FALSE;

    wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
    checkBox->SetValue((bool)property->GetValue().BoolValue());
-    return true;
+    return TRUE;
 }

 ///
@@ -639,12 +639,12 @@ bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVie
                                         wxWindow *parentWindow )
 {
    if (!m_strings)
-        return true;
+        return TRUE;

    // The item used for viewing the string: should be a text item, choice item or listbox.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow)
-        return false;
+        return FALSE;
    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
    {
        wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
@@ -654,7 +654,7 @@ bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVie
            str += text->GetValue();
            str += wxT(" is not valid.");
            wxMessageBox(str, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-            return false;
+            return FALSE;
        }
    }
    else
@@ -662,7 +662,7 @@ bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVie
        // Any other item constrains the string value,
        // so we don't have to check it.
    }
-    return true;
+    return TRUE;
 }

 bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -671,7 +671,7 @@ bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyForm
    // The item used for viewing the string: should be a text item, choice item or listbox.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow)
-        return false;
+        return FALSE;
    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
    {
        wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
@@ -699,8 +699,8 @@ bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyForm
            property->GetValue() = choice->GetStringSelection();
    }
    else
-        return false;
-    return true;
+        return FALSE;
+    return TRUE;
 }

 bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
@@ -709,7 +709,7 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
    // The item used for viewing the string: should be a text item, choice item or listbox.
    wxWindow *m_propertyWindow = property->GetWindow();
    if (!m_propertyWindow)
-        return false;
+        return FALSE;
    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
    {
        wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
@@ -756,8 +756,8 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
        choice->SetStringSelection(property->GetValue().StringValue());
    }
    else
-        return false;
-    return true;
+        return FALSE;
+    return TRUE;
 }

 #endif // wxUSE_PROPSHEET
--- a/contrib/src/deprecated/proplist.cpp
+++ b/contrib/src/deprecated/proplist.cpp
--- a/contrib/src/fl/rowlayoutpl.cpp
+++ b/contrib/src/fl/rowlayoutpl.cpp
@@ -260,7 +260,7 @@ void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
      {
            pBar->mBounds.width =
                wxMax( mpPane->mProps.mMinCBarDim.x,
-                       (int)( double(freeSpc) * (pBar->mLenRatio/pcntSum) )
+                       int( double(freeSpc) * (pBar->mLenRatio/pcntSum) )
                     );
      }
        pBar = pBar->mpNext;
--- a/contrib/src/gizmos/multicell.cpp
+++ b/contrib/src/gizmos/multicell.cpp
@@ -186,7 +186,7 @@ wxMultiCellSizer::wxMultiCellSizer( int rows, int cols)
 //---------------------------------------------------------------------------
 wxMultiCellSizer::~wxMultiCellSizer()
 {
-	WX_CLEAR_LIST(wxSizerItemList, m_children);
+	m_children.DeleteContents(TRUE);

 	free(m_maxHeight);
 	free(m_maxWidth);
@@ -296,8 +296,8 @@ void wxMultiCellSizer::RecalcSizes()
 	wxPoint c_point;
 	wxSize  c_size;

-	wxSizerItemList::compatibility_iterator 	current = m_children.GetFirst();
-	while (current)
+	wxSizerItemList::Node 	*current = m_children.GetFirst();
+	while (current != NULL)
 	{
 		wxSizerItem 	*item = current->GetData();

@@ -400,7 +400,7 @@ void wxMultiCellSizer :: GetMinimums()
 		m_weights[x]->SetWidth(0);
 	}

-	wxSizerItemList::compatibility_iterator 	node = m_children.GetFirst();
+	wxSizerItemList::Node 	*node = m_children.GetFirst();
 	while (node)
 	{
 		wxSizerItem 	*item = node->GetData();
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -236,7 +236,7 @@ void wxRemotelyScrolledTreeCtrl::ScrollToLine(int WXUNUSED(posHoriz), int posVer
    {
        UINT sbCode = SB_THUMBPOSITION;
        HWND vertScrollBar = 0;
-        MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar);
+        MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar);
    }
 #if USE_GENERIC_TREECTRL
    else
@@ -717,7 +717,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
    }

    // Find targets in splitter window and send the event to them
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    wxWindowListNode* node = GetChildren().GetFirst();
    while (node)
    {
        wxWindow* child = (wxWindow*) node->GetData();
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -229,7 +229,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
    x += view_x;
    y += view_y;
    
-    wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();
+    wxNode *node = m_owner->m_curves.GetFirst();
    while (node)
    {
        wxPlotCurve *curve = (wxPlotCurve*)node->GetData();
@@ -413,7 +413,7 @@ void wxPlotArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
        }
 */
        
-        wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();
+        wxNode *node = m_owner->m_curves.GetFirst();
        while (node)
        {
            wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
@@ -810,7 +810,7 @@ size_t wxPlotWindow::GetCount()

 wxPlotCurve *wxPlotWindow::GetAt( size_t n )
 {
-    wxList::compatibility_iterator node = m_curves.Item( n );
+    wxNode *node = m_curves.Item( n );
    if (!node)
        return (wxPlotCurve*) NULL;
        
@@ -833,7 +833,7 @@ void wxPlotWindow::SetCurrent( wxPlotCurve* current )

 void wxPlotWindow::Delete( wxPlotCurve* curve )
 {
-    wxList::compatibility_iterator node = m_curves.Find( curve );
+    wxNode *node = m_curves.Find( curve );
    if (!node) return;
    
    m_curves.DeleteObject( curve );
@@ -856,7 +856,7 @@ void wxPlotWindow::Add( wxPlotOnOffCurve *curve )

 void wxPlotWindow::Delete( wxPlotOnOffCurve* curve )
 {
-    wxList::compatibility_iterator node = m_onOffCurves.Find( curve );
+    wxNode *node = m_onOffCurves.Find( curve );
    if (!node) return;
    
    m_onOffCurves.DeleteObject( curve );
@@ -869,7 +869,7 @@ size_t wxPlotWindow::GetOnOffCurveCount()

 wxPlotOnOffCurve *wxPlotWindow::GetOnOffCurveAt( size_t n )
 {
-    wxList::compatibility_iterator node = m_onOffCurves.Item( n );
+    wxNode *node = m_onOffCurves.Item( n );
    if (!node)
        return (wxPlotOnOffCurve*) NULL;
        
@@ -950,7 +950,7 @@ void wxPlotWindow::SetZoom( double zoom )
    GetViewStart( &view_x, &view_y );
    
    wxInt32 max = 0;
-    wxList::compatibility_iterator node = m_curves.GetFirst();
+    wxNode *node = m_curves.GetFirst();
    while (node)
    {
        wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
@@ -970,7 +970,7 @@ void wxPlotWindow::SetZoom( double zoom )
 void wxPlotWindow::ResetScrollbar()
 {
    wxInt32 max = 0;
-    wxList::compatibility_iterator node = m_curves.GetFirst();
+    wxNode *node = m_curves.GetFirst();
    while (node)
    {
        wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -160,11 +160,7 @@ void ScintillaWX::Initialise() {
    dropTarget->SetScintilla(this);
    stc->SetDropTarget(dropTarget);
 #endif
-#ifdef __WXMAC__
-    vs.extraFontFlag = false;  // UseAntiAliasing
-#else
-    vs.extraFontFlag = true;   // UseAntiAliasing
-#endif
+    vs.extraFontFlag = true;
 }


--- a/contrib/src/stc/gen_iface.py
+++ b/contrib/src/stc/gen_iface.py
@@ -35,7 +35,7 @@ valPrefixes = [('SCI_', ''),
               ('SCWS_', 'WS_'),
 ]

-# Message function values that should have a CMD_ constant generated
+# Message function values that should have a CMD_ constant as well
 cmdValues = [ (2300, 2349),
              2011,
              2013,
@@ -45,14 +45,10 @@ cmdValues = [ (2300, 2349),
              2404,
              (2413, 2416),
              (2426, 2442),
-              (2450, 2455),
+              (2450, 2454),
            ]


-# Should a funciton be also generated for the CMDs?
-FUNC_FOR_CMD = True
-
-
 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {
    'position': 'int',
@@ -554,7 +550,7 @@ methodOverrideMap = {

    'GrabFocus' : (None, 0, 0, 0),

-    # Rename some that would otherwise hide the wxWindow methods
+    # Rename some that woudl otherwise hid the wxWindow methods
    'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
    'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
    'SetCursor' : ('SetSTCCursor', 0, 0, 0),
@@ -563,6 +559,82 @@ methodOverrideMap = {
    'LoadLexerLibrary' : (None, 0,0,0),


+
+    # Remove all methods that are key commands since they can be
+    # executed with CmdKeyExecute
+    'LineDown' : (None, 0, 0, 0),
+    'LineDownExtend' : (None, 0, 0, 0),
+    'LineUp' : (None, 0, 0, 0),
+    'LineUpExtend' : (None, 0, 0, 0),
+    'CharLeft' : (None, 0, 0, 0),
+    'CharLeftExtend' : (None, 0, 0, 0),
+    'CharRight' : (None, 0, 0, 0),
+    'CharRightExtend' : (None, 0, 0, 0),
+    'WordLeft' : (None, 0, 0, 0),
+    'WordLeftExtend' : (None, 0, 0, 0),
+    'WordRight' : (None, 0, 0, 0),
+    'WordRightExtend' : (None, 0, 0, 0),
+    'Home' : (None, 0, 0, 0),
+    'HomeExtend' : (None, 0, 0, 0),
+    'LineEnd' : (None, 0, 0, 0),
+    'LineEndExtend' : (None, 0, 0, 0),
+    'DocumentStart' : (None, 0, 0, 0),
+    'DocumentStartExtend' : (None, 0, 0, 0),
+    'DocumentEnd' : (None, 0, 0, 0),
+    'DocumentEndExtend' : (None, 0, 0, 0),
+    'PageUp' : (None, 0, 0, 0),
+    'PageUpExtend' : (None, 0, 0, 0),
+    'PageDown' : (None, 0, 0, 0),
+    'PageDownExtend' : (None, 0, 0, 0),
+    'EditToggleOvertype' : (None, 0, 0, 0),
+    'Cancel' : (None, 0, 0, 0),
+    'DeleteBack' : (None, 0, 0, 0),
+    'Tab' : (None, 0, 0, 0),
+    'BackTab' : (None, 0, 0, 0),
+    'NewLine' : (None, 0, 0, 0),
+    'FormFeed' : (None, 0, 0, 0),
+    'VCHome' : (None, 0, 0, 0),
+    'VCHomeExtend' : (None, 0, 0, 0),
+    'ZoomIn' : (None, 0, 0, 0),
+    'ZoomOut' : (None, 0, 0, 0),
+    'DelWordLeft' : (None, 0, 0, 0),
+    'DelWordRight' : (None, 0, 0, 0),
+    'LineCut' : (None, 0, 0, 0),
+    'LineDelete' : (None, 0, 0, 0),
+    'LineTranspose' : (None, 0, 0, 0),
+    'LowerCase' : (None, 0, 0, 0),
+    'UpperCase' : (None, 0, 0, 0),
+    'LineScrollDown' : (None, 0, 0, 0),
+    'LineScrollUp' : (None, 0, 0, 0),
+    'DeleteBackNotLine' : (None, 0, 0, 0),
+    'HomeWrap' : (None, 0, 0, 0),
+    'HomeWrapExtend' : (None, 0, 0, 0),
+    'LineEndWrap' : (None, 0, 0, 0),
+    'LineEndWrapExtend' : (None, 0, 0, 0),
+    'VCHomeWrap' : (None, 0, 0, 0),
+    'VCHomeWrapExtend' : (None, 0, 0, 0),
+    'ParaDown' : (None, 0, 0, 0),
+    'ParaDownExtend' : (None, 0, 0, 0),
+    'ParaUp' : (None, 0, 0, 0),
+    'ParaUpExtend' : (None, 0, 0, 0),
+    'LineDownRectExtend' : (None, 0, 0, 0),
+    'LineUpRectExtend' : (None, 0, 0, 0),
+    'CharLeftRectExtend' : (None, 0, 0, 0),
+    'CharRightRectExtend' : (None, 0, 0, 0),
+    'HomeRectExtend' : (None, 0, 0, 0),
+    'VCHomeRectExtend' : (None, 0, 0, 0),
+    'LineEndRectExtend' : (None, 0, 0, 0),
+    'PageUpRectExtend' : (None, 0, 0, 0),
+    'PageDownRectExtend' : (None, 0, 0, 0),
+    'StutteredPageUp' : (None, 0, 0, 0),
+    'StutteredPageUpExtend' : (None, 0, 0, 0),
+    'StutteredPageDown' : (None, 0, 0, 0),
+    'StutteredPageDownExtend' : (None, 0, 0, 0),
+    'WordLeftEnd' : (None, 0, 0, 0),
+    'WordLeftEndExtend' : (None, 0, 0, 0),
+    'WordRightEnd' : (None, 0, 0, 0),
+    'WordRightEndExtend' : (None, 0, 0, 0),
+
    '' : ('', 0, 0, 0),

    }
@@ -798,12 +870,9 @@ def parseFun(line, methods, docs, values):
    for v in cmdValues:
        if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
            parseVal('CMD_%s=%s' % (string.upper(name), number), values, docs)
-            
-            # if we are not also doing a function for CMD values, then
-            # just return, otherwise fall through to the append blow.
-            if not FUNC_FOR_CMD:
-                return
-                
+
+    #if retType == 'void' and not param1 and not param2:
+
    methods.append( (retType, name, number, param1, param2, tuple(docs)) )


--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -1608,239 +1608,11 @@ void wxStyledTextCtrl::SetFoldMarginHiColour(bool useSetting, const wxColour& fo
    SendMsg(2291, useSetting, wxColourAsLong(fore));
 }

-// Move caret down one line.
-void wxStyledTextCtrl::LineDown() {
-    SendMsg(2300, 0, 0);
-}
-
-// Move caret down one line extending selection to new caret position.
-void wxStyledTextCtrl::LineDownExtend() {
-    SendMsg(2301, 0, 0);
-}
-
-// Move caret up one line.
-void wxStyledTextCtrl::LineUp() {
-    SendMsg(2302, 0, 0);
-}
-
-// Move caret up one line extending selection to new caret position.
-void wxStyledTextCtrl::LineUpExtend() {
-    SendMsg(2303, 0, 0);
-}
-
-// Move caret left one character.
-void wxStyledTextCtrl::CharLeft() {
-    SendMsg(2304, 0, 0);
-}
-
-// Move caret left one character extending selection to new caret position.
-void wxStyledTextCtrl::CharLeftExtend() {
-    SendMsg(2305, 0, 0);
-}
-
-// Move caret right one character.
-void wxStyledTextCtrl::CharRight() {
-    SendMsg(2306, 0, 0);
-}
-
-// Move caret right one character extending selection to new caret position.
-void wxStyledTextCtrl::CharRightExtend() {
-    SendMsg(2307, 0, 0);
-}
-
-// Move caret left one word.
-void wxStyledTextCtrl::WordLeft() {
-    SendMsg(2308, 0, 0);
-}
-
-// Move caret left one word extending selection to new caret position.
-void wxStyledTextCtrl::WordLeftExtend() {
-    SendMsg(2309, 0, 0);
-}
-
-// Move caret right one word.
-void wxStyledTextCtrl::WordRight() {
-    SendMsg(2310, 0, 0);
-}
-
-// Move caret right one word extending selection to new caret position.
-void wxStyledTextCtrl::WordRightExtend() {
-    SendMsg(2311, 0, 0);
-}
-
-// Move caret to first position on line.
-void wxStyledTextCtrl::Home() {
-    SendMsg(2312, 0, 0);
-}
-
-// Move caret to first position on line extending selection to new caret position.
-void wxStyledTextCtrl::HomeExtend() {
-    SendMsg(2313, 0, 0);
-}
-
-// Move caret to last position on line.
-void wxStyledTextCtrl::LineEnd() {
-    SendMsg(2314, 0, 0);
-}
-
-// Move caret to last position on line extending selection to new caret position.
-void wxStyledTextCtrl::LineEndExtend() {
-    SendMsg(2315, 0, 0);
-}
-
-// Move caret to first position in document.
-void wxStyledTextCtrl::DocumentStart() {
-    SendMsg(2316, 0, 0);
-}
-
-// Move caret to first position in document extending selection to new caret position.
-void wxStyledTextCtrl::DocumentStartExtend() {
-    SendMsg(2317, 0, 0);
-}
-
-// Move caret to last position in document.
-void wxStyledTextCtrl::DocumentEnd() {
-    SendMsg(2318, 0, 0);
-}
-
-// Move caret to last position in document extending selection to new caret position.
-void wxStyledTextCtrl::DocumentEndExtend() {
-    SendMsg(2319, 0, 0);
-}
-
-// Move caret one page up.
-void wxStyledTextCtrl::PageUp() {
-    SendMsg(2320, 0, 0);
-}
-
-// Move caret one page up extending selection to new caret position.
-void wxStyledTextCtrl::PageUpExtend() {
-    SendMsg(2321, 0, 0);
-}
-
-// Move caret one page down.
-void wxStyledTextCtrl::PageDown() {
-    SendMsg(2322, 0, 0);
-}
-
-// Move caret one page down extending selection to new caret position.
-void wxStyledTextCtrl::PageDownExtend() {
-    SendMsg(2323, 0, 0);
-}
-
-// Switch from insert to overtype mode or the reverse.
-void wxStyledTextCtrl::EditToggleOvertype() {
-    SendMsg(2324, 0, 0);
-}
-
-// Cancel any modes such as call tip or auto-completion list display.
-void wxStyledTextCtrl::Cancel() {
-    SendMsg(2325, 0, 0);
-}
-
-// Delete the selection or if no selection, the character before the caret.
-void wxStyledTextCtrl::DeleteBack() {
-    SendMsg(2326, 0, 0);
-}
-
-// If selection is empty or all on one line replace the selection with a tab character.
-// If more than one line selected, indent the lines.
-void wxStyledTextCtrl::Tab() {
-    SendMsg(2327, 0, 0);
-}
-
-// Dedent the selected lines.
-void wxStyledTextCtrl::BackTab() {
-    SendMsg(2328, 0, 0);
-}
-
-// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-void wxStyledTextCtrl::NewLine() {
-    SendMsg(2329, 0, 0);
-}
-
-// Insert a Form Feed character.
-void wxStyledTextCtrl::FormFeed() {
-    SendMsg(2330, 0, 0);
-}
-
-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-void wxStyledTextCtrl::VCHome() {
-    SendMsg(2331, 0, 0);
-}
-
-// Like VCHome but extending selection to new caret position.
-void wxStyledTextCtrl::VCHomeExtend() {
-    SendMsg(2332, 0, 0);
-}
-
-// Magnify the displayed text by increasing the sizes by 1 point.
-void wxStyledTextCtrl::ZoomIn() {
-    SendMsg(2333, 0, 0);
-}
-
-// Make the displayed text smaller by decreasing the sizes by 1 point.
-void wxStyledTextCtrl::ZoomOut() {
-    SendMsg(2334, 0, 0);
-}
-
-// Delete the word to the left of the caret.
-void wxStyledTextCtrl::DelWordLeft() {
-    SendMsg(2335, 0, 0);
-}
-
-// Delete the word to the right of the caret.
-void wxStyledTextCtrl::DelWordRight() {
-    SendMsg(2336, 0, 0);
-}
-
-// Cut the line containing the caret.
-void wxStyledTextCtrl::LineCut() {
-    SendMsg(2337, 0, 0);
-}
-
-// Delete the line containing the caret.
-void wxStyledTextCtrl::LineDelete() {
-    SendMsg(2338, 0, 0);
-}
-
-// Switch the current line with the previous.
-void wxStyledTextCtrl::LineTranspose() {
-    SendMsg(2339, 0, 0);
-}
-
 // Duplicate the current line.
 void wxStyledTextCtrl::LineDuplicate() {
    SendMsg(2404, 0, 0);
 }

-// Transform the selection to lower case.
-void wxStyledTextCtrl::LowerCase() {
-    SendMsg(2340, 0, 0);
-}
-
-// Transform the selection to upper case.
-void wxStyledTextCtrl::UpperCase() {
-    SendMsg(2341, 0, 0);
-}
-
-// Scroll the document down, keeping the caret visible.
-void wxStyledTextCtrl::LineScrollDown() {
-    SendMsg(2342, 0, 0);
-}
-
-// Scroll the document up, keeping the caret visible.
-void wxStyledTextCtrl::LineScrollUp() {
-    SendMsg(2343, 0, 0);
-}
-
-// Delete the selection or if no selection, the character before the caret.
-// Will not delete the character before at the start of a line.
-void wxStyledTextCtrl::DeleteBackNotLine() {
-    SendMsg(2344, 0, 0);
-}
-
 // Move caret to first position on display line.
 void wxStyledTextCtrl::HomeDisplay() {
    SendMsg(2345, 0, 0);
@@ -1863,30 +1635,6 @@ void wxStyledTextCtrl::LineEndDisplayExtend() {
    SendMsg(2348, 0, 0);
 }

-// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-// except they behave differently when word-wrap is enabled:
-// They go first to the start / end of the display line, like (Home|LineEnd)Display
-// The difference is that, the cursor is already at the point, it goes on to the start
-// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-void wxStyledTextCtrl::HomeWrap() {
-    SendMsg(2349, 0, 0);
-}
-void wxStyledTextCtrl::HomeWrapExtend() {
-    SendMsg(2450, 0, 0);
-}
-void wxStyledTextCtrl::LineEndWrap() {
-    SendMsg(2451, 0, 0);
-}
-void wxStyledTextCtrl::LineEndWrapExtend() {
-    SendMsg(2452, 0, 0);
-}
-void wxStyledTextCtrl::VCHomeWrap() {
-    SendMsg(2453, 0, 0);
-}
-void wxStyledTextCtrl::VCHomeWrapExtend() {
-    SendMsg(2454, 0, 0);
-}
-
 // Copy the line containing the caret.
 void wxStyledTextCtrl::LineCopy() {
    SendMsg(2455, 0, 0);
@@ -2184,20 +1932,6 @@ void wxStyledTextCtrl::SetHotspotSingleLine(bool singleLine) {
    SendMsg(2421, singleLine, 0);
 }

-// Move caret between paragraphs (delimited by empty lines).
-void wxStyledTextCtrl::ParaDown() {
-    SendMsg(2413, 0, 0);
-}
-void wxStyledTextCtrl::ParaDownExtend() {
-    SendMsg(2414, 0, 0);
-}
-void wxStyledTextCtrl::ParaUp() {
-    SendMsg(2415, 0, 0);
-}
-void wxStyledTextCtrl::ParaUpExtend() {
-    SendMsg(2416, 0, 0);
-}
-
 // Given a valid document position, return the previous position taking code
 // page into account. Returns 0 if passed 0.
 int wxStyledTextCtrl::PositionBefore(int pos) {
@@ -2241,93 +1975,6 @@ int wxStyledTextCtrl::GetLineSelEndPosition(int line) {
    return SendMsg(2425, line, 0);
 }

-// Move caret down one line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::LineDownRectExtend() {
-    SendMsg(2426, 0, 0);
-}
-
-// Move caret up one line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::LineUpRectExtend() {
-    SendMsg(2427, 0, 0);
-}
-
-// Move caret left one character, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::CharLeftRectExtend() {
-    SendMsg(2428, 0, 0);
-}
-
-// Move caret right one character, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::CharRightRectExtend() {
-    SendMsg(2429, 0, 0);
-}
-
-// Move caret to first position on line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::HomeRectExtend() {
-    SendMsg(2430, 0, 0);
-}
-
-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-// In either case, extend rectangular selection to new caret position.
-void wxStyledTextCtrl::VCHomeRectExtend() {
-    SendMsg(2431, 0, 0);
-}
-
-// Move caret to last position on line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::LineEndRectExtend() {
-    SendMsg(2432, 0, 0);
-}
-
-// Move caret one page up, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::PageUpRectExtend() {
-    SendMsg(2433, 0, 0);
-}
-
-// Move caret one page down, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::PageDownRectExtend() {
-    SendMsg(2434, 0, 0);
-}
-
-// Move caret to top of page, or one page up if already at top of page.
-void wxStyledTextCtrl::StutteredPageUp() {
-    SendMsg(2435, 0, 0);
-}
-
-// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-void wxStyledTextCtrl::StutteredPageUpExtend() {
-    SendMsg(2436, 0, 0);
-}
-
-// Move caret to bottom of page, or one page down if already at bottom of page.
-void wxStyledTextCtrl::StutteredPageDown() {
-    SendMsg(2437, 0, 0);
-}
-
-// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-void wxStyledTextCtrl::StutteredPageDownExtend() {
-    SendMsg(2438, 0, 0);
-}
-
-// Move caret left one word, position cursor at end of word.
-void wxStyledTextCtrl::WordLeftEnd() {
-    SendMsg(2439, 0, 0);
-}
-
-// Move caret left one word, position cursor at end of word, extending selection to new caret position.
-void wxStyledTextCtrl::WordLeftEndExtend() {
-    SendMsg(2440, 0, 0);
-}
-
-// Move caret right one word, position cursor at end of word.
-void wxStyledTextCtrl::WordRightEnd() {
-    SendMsg(2441, 0, 0);
-}
-
-// Move caret right one word, position cursor at end of word, extending selection to new caret position.
-void wxStyledTextCtrl::WordRightEndExtend() {
-    SendMsg(2442, 0, 0);
-}
-
 // Set the set of characters making up whitespace for when moving or selecting by word.
 // Should be called after SetWordChars.
 void wxStyledTextCtrl::SetWhitespaceChars(const wxString& characters) {
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -410,11 +410,7 @@ bool wxXmlResource::UpdateResources()
                }

                ProcessPlatformProperty(m_data[i].Doc->GetRoot());
-#if wxUSE_FILESYSTEM
 				m_data[i].Time = file->GetModificationTime();
-#else
-                m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
-#endif
 			}

 #           if wxUSE_FILESYSTEM
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -979,8 +979,7 @@ void rc2wxr::ParseSlider(wxString WXUNUSED(label), wxString varname)

 wxString tok;

-while (ReadOrs(tok))
-    ;
+while (ReadOrs(tok));

 wxFprintf(m_wxr,_T("  control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',"),m_controlid,varname.c_str());

@@ -1010,8 +1009,7 @@ void rc2wxr::ParseProgressBar(wxString WXUNUSED(label), wxString varname)

 wxString tok;

-while (ReadOrs(tok))
-    ;
+while (ReadOrs(tok));

 wxFprintf(m_wxr,_T("  control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',"),m_controlid,varname.c_str());

@@ -1073,8 +1071,7 @@ if (tok==_T("BS_AUTOCHECKBOX"))

    wxFprintf(m_wxr,_T("  control = [%i,wxCheckBox,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str());

-    while (ReadOrs(tok))
-        ;
+    while (ReadOrs(tok));

    ReadRect(x,y,width,height);

@@ -1092,8 +1089,7 @@ if (tok==_T("BS_AUTORADIOBUTTON"))

    wxFprintf(m_wxr,_T("  control = [%i,wxRadioButton,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str());

-    while(ReadOrs(tok))
-        ;
+    while(ReadOrs(tok));

    ReadRect(x,y,width,height);

--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -1077,11 +1077,9 @@ void rc2xml::ParseMenuItem()
        ptoken.MakeUpper();
        if (token==_T("CHECKED"))
            m_xmlfile.Write(_T("\t\t\t<checkable>1</checkable>\n"));
-        else if (token==_T("MENUBREAK"))
-            ;
+        else if (token==_T("MENUBREAK"));
 //m_xmlfile.Write("\t\t\t</break>\n");
-        else if (token==_T("GRAYED"))
-            ;
+        else if (token==_T("GRAYED"));
        else
            wxLogError(_T("Unknown Menu Item token:")+token);

--- a/contrib/utils/wxrcedit/splittree.cpp
+++ b/contrib/utils/wxrcedit/splittree.cpp
@@ -209,7 +209,7 @@ void wxRemotelyScrolledTreeCtrl::ScrollToLine(int WXUNUSED(posHoriz), int posVer
    {
 	    UINT sbCode = SB_THUMBPOSITION;
 	    HWND vertScrollBar = 0;
-	    MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar);
+	    MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar);
    }
 #if USE_GENERIC_TREECTRL
    else
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,11 @@
-wxwidgets for Debian
+wxwindows for Debian
 ----------------------

-The following packages are built from the wxWidgets CVS source.
+The following packages are built from the wxWindows CVS source.
+
+libwxbase		wxBase runtime shared libraries
+libwxbase-dev		extra files and static libs for building wxBase apps
+libwxbase-dbg		wxBase libraries built with -g and __WXDEBUG__

 libwxgtk		wxGTK runtime shared libraries
 libwxgtk-dev		extra files and static libs for building wxGTK apps
@@ -11,24 +15,24 @@ libwxgtk-python		Python binding to wxGTK  (from 2.2.3 onward, this
 			obsoletes the libwxgtk-python-contrib package as
 			all python modules are built into a single monolith)

-libwxgtk-contrib	wxWin contrib runtime shared libs (built with wxGTK)
-libwxgtk-contrib-dev	extra files and static contrib libs for building apps
+wxwin-contrib		wxWin contrib runtime shared libs (built with wxGTK)
+wxwin-contrib-dev	extra files and static contrib libs for building apps

-wx-headers		common header files for building wxWidgets apps
-wx-doc			HTML version of the wxWidgets manual
-wx-examples		wxWidgets and wxPython demos and samples (source)
-wx-i18n			message catalogs for native language support
+wxwin-headers		common header files for building wxWindows apps
+wxwin-doc		HTML version of the wxWindows manual
+wxwin-examples		wxWindows and wxPython demos and samples (source)
+wxwin-i18n		message catalogs for native language support


-	The following binaries can be built from the source package
+	The following three can be built from the source package
 	with the mingw32 cross compiler, but are not currently
 	distributed by Debian.  If you feel that should change,
-	please file a bug against the wxwidgets2.5 package, or
+	please file a bug against the wxwindows2.4 package, or
 	append your views to a report already there if you're not
 	the first to do so.

 	[ you can check the current state of affairs at:
-	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwidgets2.5 ]
+	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.4 ]

 	Oh and, please do *not* file bug reports for these packages
 	to the Debian bts.  But do feel free to email me personally
@@ -36,7 +40,13 @@ wx-i18n			message catalogs for native language support

 libwxmsw-dev		mingw32-cross wxMSW libs.
 libwxmsw-dbg		mingw32-cross wxMSW (debug) libs.
-wx-headers-msw		extra headers needed for wxMSW.
+libwxbase-msw-dev	mingw32-cross wxBase libs.
+libwxbase-msw-dbg	mingw32-cross wxBase (debug) libs.
+wxwin-headers-msw	extra headers needed for wxMSW.
+
+libwxgtk-univ		wxUniversal for Gtk.  NOTE this package is obsolete
+			and will be replaced by wxX11 and wxX11-univ at
+			some future time.


 -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
--- a/debian/README.examples
+++ b/debian/README.examples
@@ -1,22 +0,0 @@
-
-These examples are provided as extended documentation for the wxWidgets
-package.  If you wish to actually run them rather than just browse them
-as documents you should copy them into a working directory elsewhere
-first.  Note that some of them will attempt to write to the current
-working directory, or to the home directory of the user they are run as.
-
-Some of the files have been compressed in accordance with Debian policy
-regarding documentation, you will need to uncompress such files before
-building or executing them.
-
-The examples provided here typically show a minimal implementation of
-the feature(s) they are demonstrating.  There are examples of more
-complete (mini) applications, available in the /wxPython/samples and
-/demos directories of the wxWidgets cvs repository (which is browsable
-via http://cvs.wxwidgets.org), or of course you can always apt-get the
-source of any wx using package for some less contrived examples of
-real world wx applications.
-
-  Ron
-
-
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,95 +1,9 @@
-wxwidgets2.5 (2.5.1.1) experimental; urgency=low
-
-  * The s/ndow/dget/g release.
-  * Yes, the name has changed and the terrorists have won again.
-    Having a name too similar to Lindows apparently makes us a
-    liability to the illusion their assailants will want to project
-    in court.  Eleven or so years of unbroken, unquestioned usage
-    was not nearly so interesting to these people as the fact we
-    were a soft target and easy to deprive of due process.
-  * wxGTK is now built with gtk2 and unicode support.
-  * wxBase is no longer a separate package, it is built with the
-    GUI libs which now depend on it.  We might split it out again
-    one day if there is a need for that.
-  * Added support for GNU/K*BSD (thanks again to Robert Millan).
-  * Non-core functionality is now provided by separate libraries
-    rather than simply being built into a single behemoth unit.
-    Of course, given the way these things work, almost none of
-    them are actually smaller, and the load time is unlikely to
-    improve either, but the logical separation may be beneficial.
-  * Removed many elements of the build scripts that are no longer
-    required due to improvements and changes elsewhere.
-  * Added README.examples for people who think these are packaged
-    as demos instead of as extended documentation.
-
- -- Ron Lee <ron@debian.org>  Fri, 27 Feb 2004 17:00:29 +1030
-
 wxwindows2.5 (2.5.0) unstable; urgency=low

  * New beginnings.  Back to development flavored chaos again.

 -- Ron Lee <ron@debian.org>  Thu, 19 Dec 2002 01:08:50 -0800

-wxwindows2.4 (2.4.2.4) unstable; urgency=low
-
-  * Modified build scripts to use pythonX.Y instead of python(>=X.Y)
-  * Removed bogus hard coded python2.2-xml.  Closes: #216182
-  * Enabled iostream support despite my opinion of this c++ 'feature'.
-    Closes: #211050
-  * Event handling for menus with bitmaps fixed.  Closes: #214788
-  * Includes fixes for wxHTTP and wxURL parsing. Closes: #211023, #213600
-
- -- Ron Lee <ron@debian.org>  Sat, 25 Oct 2003 13:48:07 +0930
-
-wxwindows2.4 (2.4.1.2) unstable; urgency=low
-
-  * New stable release.  Closes: #198622
-  * Ack python NMU changes, Thanks Josselin!
-  * Hurd support added to configure.  Closes: #191581
-  * Fixes ctrl-tab problem with pyslsk.  Closes: #187923
-  * Fixed configure for autoconf 2.57-3.  Closes: #190755
-  * Added conflict/replace for -doc.  Closes: #202242
-
- -- Ron Lee <ron@debian.org>  Fri, 22 Aug 2003 15:59:12 +0930
-
-wxwindows2.4 (2.4.0.8-0.1) unstable; urgency=low
-
-  * NMU for python transition.
-  * Build-depend and depend on python 2.3 (closes: #204737).
-
- -- Josselin Mouette <joss@debian.org>  Wed, 13 Aug 2003 22:21:48 +0200
-
-wxwindows2.4 (2.4.0.9) unstable; urgency=low
-
-  * Updated package sections to suit the new taxonomy.
-  * No public release of this version.
-
- -- Ron Lee <ron@debian.org>  Sat, 19 Apr 2003 20:13:39 -0700
-
-wxwindows2.4 (2.4.0.8) unstable; urgency=low
-
-  * The "I wish people would read the existing discussion about new releases
-    before posting 'reminder' bugs" release.  Closes: #189144
-  * Moved back to using png2.  gtk1 forces that on anything using it and
-    gtk2 support is still too flakey both in wx and dependent apps for
-    us to entertain it in a stable release.  This is a *really* messed
-    up situation for anyone trying to maintain a development machine.
-    Thank the png and gtk theme people if its a pain in your ass too.
-    Closes: #186779
-  * Add real package options to the gl build deps.  Closes: #182210
-  * Really fix the XRCed problem, unlike 2.4.0.7 ; ) Closes: #183712
-
- -- Ron Lee <ron@debian.org>  Tue, 15 Apr 2003 18:42:54 -0700
-
-wxwindows2.4 (2.4.0.3) unstable; urgency=low
-
-  * Changed Conflict to Replaces so people can use 2.4 -dev before all
-    their 2.3 deps are gone.  Closes: #178305
-  * Added wxPy supplied 2.3 distutils to the source package, apparently the
-    standard 2.2 one is now insufficient.  This hopefully Closes: #178457
-
- -- Ron Lee <ron@debian.org>  Mon, 27 Jan 2003 17:36:59 -0800
-
 wxwindows2.4 (2.4.0.2) unstable; urgency=low

  * Added missing quantize.h to install.  Closes: #178135
--- a/debian/compat
+++ b/debian/compat
@@ -1 +0,0 @@
-4
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,67 @@
-Source: wxwidgets=V
+Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
+Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng12-0-dev, libtiff3g-dev, libgl-dev, libglu-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.5.8.0
+
+Package: libwxbase=V
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: wxBase library (runtime) - non-GUI support classes of wxWindows toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
+ Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package is only useful for non-GUI apps.  It offers a subset of the
+ classes in libwx_gtk=V for use in console apps and daemons.  You do not need
+ this package to build or use wxWindows GUI apps.
+
+Package: libwxbase=V-dev
+Architecture: any
+Section: devel
+Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
+Suggests: wxwin=V-doc, gettext
+Conflicts: libwxbase-dev
+Replaces: libwxbase-dev
+Provides: libwxbase-dev
+Description: wxBase library (development) - non-GUI support classes of wxWindows toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
+ Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package provides the files needed to compile apps using the wxBase library.
+
+Package: libwxbase=V-dbg
+Architecture: any
+Section: devel
+Priority: extra
+Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
+Conflicts: libwxbase-dbg
+Replaces: libwxbase-dbg
+Provides: libwxbase-dbg
+Description: wxBase library (debug) - non-GUI support classes of wxWindows toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
+ Solaris, HP-UX, ...) win32, and BeOS.
+ .
+ This package provides a debug version of the wxBase library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWindows itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.

 Package: libwxgtk=V
 Architecture: any
@@ -11,62 +69,62 @@ Section: libs
 Depends: ${shlibs:Depends}
 Suggests: libgl1
 Replaces: wxgtk2.1
-Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
 This package provides the shared libraries needed to run programs linked
- against wxWidgets.  To use the (optional) glcanvas library you will need
+ against wxWindows.  To use the (optional) glcanvas library you will need
 to have Mesa or OpenGL installed.

 Package: libwxgtk=V-dev
 Architecture: any
-Section: libdevel
-Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
-Suggests: wx=V-doc, libstdc++-dev, gettext, libgl-dev
-Conflicts: libwxgtk-dev, libwxbase-dev
-Replaces: libwxgtk-dev, libwxbase-dev, wxgtk2.1-dev
+Section: devel
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Conflicts: libwxgtk-dev
+Replaces: libwxgtk-dev, wxgtk2.1-dev
 Provides: libwxgtk-dev
-Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package provides files needed to compile wxWidgets programs.  If you
+ This package provides files needed to compile wxWindows programs.  If you
 want to compile apps using the (optional) glcanvas library you will need
 to have Mesa or OpenGL installed too.

 Package: libwxgtk=V-dbg
 Architecture: any
-Section: libdevel
+Section: devel
 Priority: extra
-Depends: wx=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxgtk-dbg, libwxbase-dbg
-Replaces: libwxgtk-dbg, libwxbase-dbg
+Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
+Conflicts: libwxgtk-dbg
+Replaces: libwxgtk-dbg
 Provides: libwxgtk-dbg
-Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package provides a debug version of the wxGTK library.  It is compiled
+ This package provides a debug version of the wxGtk library.  It is compiled
 both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
- provides many internal checks by wxWidgets itself that are not performed on
+ provides many internal checks by wxWindows itself that are not performed on
 apps compiled with the 'release version' libs in the -dev package.

 Package: libwxgtk=V-python
 Architecture: any
-Section: python
-Depends: =PY, ${shlibs:Depends}
-Suggests: wx=V-doc, wx=V-examples, =PY-xml
+Section: interpreters
+Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
+Suggests: wxwin=V-doc, wxwin=V-examples, python2.2-xml
 Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
 Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
 Provides: libwxgtk-python
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
 This package provides a Python binding to the wxGTK library and it's
 contrib libs.  If you wish to use xrced you'll also need the python-xml
@@ -75,86 +133,117 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
 Package: libwxgtk=V-contrib
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
-Description: wxWidgets Cross-platform C++ GUI toolkit (runtime contrib libs)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
+Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package provides the contrib libs from the wxWidgets source tree
+ This package provides the contrib libs from the wxWindows source tree

 Package: libwxgtk=V-contrib-dev
 Architecture: any
-Section: libdevel
-Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
+Section: devel
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
 Conflicts: libwxgtk-contrib-dev
 Replaces: libwxgtk-contrib-dev
 Provides: libwxgtk-contrib-dev
-Description: wxWidgets Cross-platform C++ GUI toolkit (development contrib libs)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
 Install this package if you wish to compile applications that use the
- contrib libs from the wxWidgets source tree.
+ contrib libs from the wxWindows source tree.

-Package: wx=V-headers
+Package: wxwin=V-headers
 Architecture: any
 Section: devel
-Conflicts: wx-headers, wxwin-headers
-Replaces: wx-headers, wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
-Provides: wx-headers
-Description: wxWidgets Cross-platform C++ GUI toolkit (header files)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Conflicts: wxwin-headers, libwxgtk2.3
+Replaces: wxwin-headers, wxgtk2.1-dev
+Provides: wxwin-headers
+Description: wxWindows Cross-platform C++ GUI toolkit (header files)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
 This package provides the common header files required to build applications
- using the wxWidgets toolkit.
+ using the wxWindows toolkit.

-Package: wx=V-i18n
+Package: wxwin=V-i18n
 Architecture: all
 Section: libs
-Conflicts: wx-i18n, wxwin-i18n
-Replaces: wx-i18n, wxwin-i18n
-Provides: wx-i18n
-Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Conflicts: wxwin-i18n
+Replaces: wxwin-i18n
+Provides: wxwin-i18n
+Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package provides the i18n message catalogs for wxWidgets.
+ This package provides the i18n message catalogs for wxWindows.

-Package: wx=V-doc
+Package: wxwin=V-doc
 Architecture: all
 Section: doc
-Conflicts: wx-doc, wxwin2.2-doc, wxwin-doc
-Replaces: wx-doc, wxwin-doc
-Provides: wx-doc
 Suggests: doc-base, www-browser
-Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package provides a HTML version of the wxWidgets reference manual.
+ This package provides a HTML version of the wxWindows reference manual.

-Package: wx=V-examples
+Package: wxwin=V-examples
 Architecture: all
 Section: devel
 Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
-Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
+Description: wxWindows Cross-platform C++ GUI toolkit (examples)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package contains examples of using the wxWidgets toolkit in
+ This package contains examples of using the wxWindows toolkit in
 C++ and with the wxPython language binding.

+Package: libwxgtk=V-univ
+Architecture: any
+Section: libs
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev, ${shlibs:Depends}
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package is built to use the wxUNIVERSAL widget set instead of
+ native gtk widgets.
+
+Package: libwxbase-msw=V-dev
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers-msw (= ${Source-Version})
+Conflicts: libwxbase-msw-dev
+Replaces: libwxbase-msw-dev
+Provides: libwxbase-msw-dev
+Description: wxBase mingw32msvc-cross
+ mingw32msvc-cross wxBase libs.
+
+Package: libwxbase-msw=V-dbg
+Architecture: i386
+Section: otherosfs
+Depends: wxwin=V-headers-msw (= ${Source-Version})
+Conflicts: libwxbase-msw-dbg
+Replaces: libwxbase-msw-dbg
+Provides: libwxbase-msw-dbg
+Description: wxBase mingw32msvc-cross (debug)
+ mingw32msvc-cross wxBase libs.
+ __WXDEBUG__ version.
+
 Package: libwxmsw=V-dev
 Architecture: i386
 Section: otherosfs
-Depends: wx=V-headers-msw (= ${Source-Version})
+Depends: wxwin=V-headers-msw (= ${Source-Version})
 Conflicts: libwxmsw-dev
 Replaces: libwxmsw-dev
 Provides: libwxmsw-dev
@@ -164,7 +253,7 @@ Description: wxMSW mingw32msvc-cross
 Package: libwxmsw=V-dbg
 Architecture: i386
 Section: otherosfs
-Depends: wx=V-headers-msw (= ${Source-Version})
+Depends: wxwin=V-headers-msw (= ${Source-Version})
 Conflicts: libwxmsw-dbg
 Replaces: libwxmsw-dbg
 Provides: libwxmsw-dbg
@@ -172,13 +261,13 @@ Description: wxMSW mingw32msvc-cross (debug)
 mingw32msvc-cross wxMSW libs.
 __WXDEBUG__ version.

-Package: wx=V-headers-msw
+Package: wxwin=V-headers-msw
 Architecture: i386
 Section: otherosfs
-Depends: wx=V-headers (= ${Source-Version})
-Conflicts: wx-headers-msw, wxwin-headers-msw
-Replaces: wx-headers-msw, wxwin-headers-msw
-Provides: wx-headers-msw
-Description: Extra wxWidgets headers for mingw32msvc-cross
- Headers required by the wxWidgets mingw32msvc-cross libraries.
+Depends: wxwin=V-headers (= ${Source-Version})
+Conflicts: wxwin-headers-msw
+Replaces: wxwin-headers-msw
+Provides: wxwin-headers-msw
+Description: Extra wxWindows headers for mingw32msvc-cross
+ Headers required by the wxWindows mingw32msvc-cross libraries.

--- a/debian/copyright
+++ b/debian/copyright
@@ -191,32 +191,4 @@ under two different licences:
  DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
  OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-----------------------------------------------------------------------------
-
-XRCed is released under the following terms:
-
-Copyright (c) 2002, Roman Rolinsky <rollrom@users.sourceforge.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-

--- a/debian/libwxbase-dbg.dirs
+++ b/debian/libwxbase-dbg.dirs
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/wx/include/based-=V/wx
+usr/share/man/man1
+usr/share/lintian/overrides
+
--- a/debian/libwxbase-dbg.links
+++ b/debian/libwxbase-dbg.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz
+
--- a/debian/libwxbase-dbg.postinst
+++ b/debian/libwxbase-dbg.postinst
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
--- a/debian/libwxbase-dbg.prerm
+++ b/debian/libwxbase-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbased-=V-config
+
+#DEBHELPER#
+
--- a/debian/libwxbase-dev.dirs
+++ b/debian/libwxbase-dev.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/wx/include/base-=V/wx
+usr/share/man/man1
--- a/debian/libwxbase-dev.links
+++ b/debian/libwxbase-dev.links
@@ -0,0 +1 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz
--- a/debian/libwxbase-dev.postinst
+++ b/debian/libwxbase-dev.postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
+
+#DEBHELPER#
+
--- a/debian/libwxbase-dev.prerm
+++ b/debian/libwxbase-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbase-=V-config
+
+#DEBHELPER#
+
--- a/debian/libwxbase-msw-dbg.dirs
+++ b/debian/libwxbase-msw-dbg.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/=H/lib/wx/include/based-=V-=H/wx
+usr/share/man/man1
+
--- a/debian/libwxbase-msw-dbg.links
+++ b/debian/libwxbase-msw-dbg.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-=H-config.1.gz
+
--- a/debian/libwxbase-msw-dbg.postinst
+++ b/debian/libwxbase-msw-dbg.postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-=H-config 40
+
+#DEBHELPER#
+
--- a/debian/libwxbase-msw-dbg.prerm
+++ b/debian/libwxbase-msw-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbased-=V-=H-config
+
+#DEBHELPER#
+
--- a/debian/libwxbase-msw-dev.dirs
+++ b/debian/libwxbase-msw-dev.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/=H/lib/wx/include/base-=V-=H/wx
+usr/share/man/man1
+
--- a/debian/libwxbase-msw-dev.links
+++ b/debian/libwxbase-msw-dev.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
+
--- a/debian/libwxbase-msw-dev.postinst
+++ b/debian/libwxbase-msw-dev.postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
+
+#DEBHELPER#
+
--- a/debian/libwxbase-msw-dev.prerm
+++ b/debian/libwxbase-msw-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
+
+#DEBHELPER#
+
--- a/debian/libwxbase.dirs
+++ b/debian/libwxbase.dirs
@@ -0,0 +1,2 @@
+usr/lib
+
--- a/debian/libwxbase.postinst
+++ b/debian/libwxbase.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
--- a/debian/libwxgtk-contrib-dev.dirs
+++ b/debian/libwxgtk-contrib-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib/
+
--- a/debian/libwxgtk-contrib.dirs
+++ b/debian/libwxgtk-contrib.dirs
@@ -0,0 +1,2 @@
+usr/lib/
+
--- a/debian/libwxgtk-contrib.postinst
+++ b/debian/libwxgtk-contrib.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
--- a/debian/libwxgtk-dbg.dirs
+++ b/debian/libwxgtk-dbg.dirs
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/wx/include/gtkd-=V/wx
+usr/share/man/man1
+usr/share/lintian/overrides
+
--- a/debian/libwxgtk-dbg.links
+++ b/debian/libwxgtk-dbg.links
@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2ud-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz

--- a/debian/libwxgtk-dbg.postinst
+++ b/debian/libwxgtk-dbg.postinst
@@ -1,7 +1,11 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2ud-=V-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi

 #DEBHELPER#

--- a/debian/libwxgtk-dbg.prerm
+++ b/debian/libwxgtk-dbg.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxgtk2ud-=V-config
+update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config

 #DEBHELPER#

--- a/debian/libwxgtk-dev.dirs
+++ b/debian/libwxgtk-dev.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/wx/include/gtk-=V/wx
+usr/share/man/man1
+
--- a/debian/libwxgtk-dev.links
+++ b/debian/libwxgtk-dev.links
@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2u-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz

--- a/debian/libwxgtk-dev.postinst
+++ b/debian/libwxgtk-dev.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2u-=V-config 70
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70

 #DEBHELPER#

--- a/debian/libwxgtk-dev.prerm
+++ b/debian/libwxgtk-dev.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxgtk2u-=V-config
+update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config

 #DEBHELPER#

--- a/debian/libwxgtk-python.docs
+++ b/debian/libwxgtk-python.docs
@@ -1,4 +1,3 @@
-wxPython/docs/README.txt
-wxPython/docs/CHANGES.txt
-wxPython/docs/MigrationGuide.txt
+wxPython/README.txt
+wxPython/CHANGES.txt

--- a/debian/libwxgtk-python.menu
+++ b/debian/libwxgtk-python.menu
@@ -1,7 +1,7 @@
-?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
+?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
  title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
+?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
  title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
+?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
  title="xrced" command="/usr/bin/xrced"

--- a/debian/libwxgtk-univ.dirs
+++ b/debian/libwxgtk-univ.dirs
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/wx/include/gtkuniv-=V/wx
+usr/share/man/man1
+usr/share/lintian/overrides
+
--- a/debian/libwxgtk-univ.links
+++ b/debian/libwxgtk-univ.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkuniv-=V-config.1.gz
+
--- a/debian/libwxgtk-univ.postinst
+++ b/debian/libwxgtk-univ.postinst
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkuniv-=V-config 50
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
--- a/debian/libwxgtk-univ.prerm
+++ b/debian/libwxgtk-univ.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxgtkuniv-=V-config
+
+#DEBHELPER#
+
--- a/debian/libwxgtk.dirs
+++ b/debian/libwxgtk.dirs
@@ -0,0 +1,3 @@
+usr/lib
+usr/share
+
--- a/debian/libwxgtk.postinst
+++ b/debian/libwxgtk.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
--- a/debian/lintian-override
+++ b/debian/lintian-override
@@ -1,2 +1,4 @@
 libwxgtk2.5-dbg: non-dev-pkg-with-shlib-symlink
+libwxbase2.5-dbg: non-dev-pkg-with-shlib-symlink
+libwxgtk2.5-univ: non-dev-pkg-with-shlib-symlink

--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file to build packages from wx CVS source
+# debian/rules file to build packages from wxWindows CVS source
 #
 # Sculpted 13/2/2000 by Ron Lee <ron@debian.org> from new and
 # variously stolen code :-)
@@ -7,141 +7,215 @@
 # Joey Hess and others.

 #export DH_VERBOSE=1
+export DH_COMPAT=2
 export DH_OPTIONS

-release    := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p')
-python_ver := python$(shell python -c "import sys;print sys.version[:3]")
+release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
+python_dir:=python$(shell python -c "import sys;print sys.version[:3]")

-cross_host  = i586-mingw32msvc
-cross_build = $(shell ./config.guess)
+cross_host=i586-mingw32msvc
+cross_build=$(shell ./config.guess)

-config_cache       = ../config_deb.cache
-config_cache_cross = ../config_deb_cross.cache
+config_cache=../config_deb.cache
+config_cache_cross=../config_deb_cross.cache

 # Packages to build:
-package_gtk_lib         = libwxgtk$(release)
-package_gtk_dev         = libwxgtk$(release)-dev
-package_gtk_dbg         = libwxgtk$(release)-dbg
-package_gtk_py          = libwxgtk$(release)-python
-package_gtk_contrib     = libwxgtk$(release)-contrib
-package_gtk_contrib_dev = libwxgtk$(release)-contrib-dev
-package_headers         = wx$(release)-headers
-package_i18n            = wx$(release)-i18n
-package_doc             = wx$(release)-doc
-package_examples        = wx$(release)-examples
+package_wxbase_lib=libwxbase$(release)
+package_wxbase_dev=libwxbase$(release)-dev
+package_wxbase_dbg=libwxbase$(release)-dbg
+package_gtk_lib=libwxgtk$(release)
+package_gtk_dev=libwxgtk$(release)-dev
+package_gtk_dbg=libwxgtk$(release)-dbg
+package_gtk_py=libwxgtk$(release)-python
+package_gtk_contrib=libwxgtk$(release)-contrib
+package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
+package_headers=wxwin$(release)-headers
+package_i18n=wxwin$(release)-i18n
+package_doc=wxwin$(release)-doc
+package_examples=wxwin$(release)-examples

-package_msw_dev         = libwxmsw$(release)-dev
-package_msw_dbg         = libwxmsw$(release)-dbg
-package_headers_msw     = wx$(release)-headers-msw
+package_gtk_univ=libwxgtk$(release)-univ
+
+package_wxbase_msw_dev=libwxbase-msw$(release)-dev
+package_wxbase_msw_dbg=libwxbase-msw$(release)-dbg
+package_msw_dev=libwxmsw$(release)-dev
+package_msw_dbg=libwxmsw$(release)-dbg
+package_headers_msw=wxwin$(release)-headers-msw

 # Build directories:
-objdir_gtk_shared          = objs_gtk_sh
-objdir_gtk_static          = objs_gtk_st
-objdir_gtk_debug           = objs_gtk_d
-objdir_gtk_install         = objs_gtk_install
-objdir_gtk_contrib_install = objs_gtk_contrib_install
-objdir_doc_cruft           = objs_doc_con
-objdir_doc                 = docs/wx-manual.html
-objdir_examples            = docs/examples
-objdir_i18n                = locale
+objdir_wxbase_shared=objs_wxbase_sh
+objdir_wxbase_static=objs_wxbase_st
+objdir_wxbase_debug=objs_wxbase_d
+objdir_gtk_shared=objs_gtk_sh
+objdir_gtk_static=objs_gtk_st
+objdir_gtk_debug=objs_gtk_d
+objdir_gtk_install=objs_gtk_install
+objdir_gtk_contrib_install=objs_gtk_contrib_install
+objdir_doc_cruft=objs_doc_con
+objdir_doc=docs/wxWindows-manual.html
+objdir_examples=docs/examples
+objdir_i18n=locale

-objdir_msw_shared          = objs_msw_sh
-objdir_msw_static          = objs_msw_st
-objdir_msw_dbg             = objs_msw_d
+objdir_gtk_univ=objs_gtk_univ
+objdir_univ_install=objs_univ_install

-objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
-	  $(objdir_gtk_install) $(objdir_gtk_contrib_install)             \
-	  $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
-	  $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
+objdir_wxbase_msw_shared=objs_wxbase_msw_sh
+objdir_wxbase_msw_static=objs_wxbase_msw_st
+objdir_wxbase_msw_dbg=objs_wxbase_msw_d
+objdir_msw_shared=objs_msw_sh
+objdir_msw_static=objs_msw_st
+objdir_msw_dbg=objs_msw_d
+
+objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
+	$(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
+	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
+	$(objdir_examples)                                                     \
+	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
+	$(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
+	$(objdir_msw_dbg)

 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
-#	it's pulled out of the wxGTK shared lib package.
-
+#	it's pulled out of the wxGtk shared lib package.

 # Build stamps:
-build_arch_stamps = build-gtk-shared-stamp build-gtk-static-stamp         \
-                    build-gtk-debug-stamp                                 \
-                    build-contrib-shared-stamp build-contrib-static-stamp \
-                    build-i18n-stamp build-gtk-py-stamp
+build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
+                  build-wxbase-debug-stamp build-gtk-shared-stamp \
+                  build-gtk-static-stamp build-gtk-debug-stamp \
+                  build-contrib-shared-stamp build-contrib-static-stamp \
+                  build-gtk-py-stamp build-i18n-stamp

+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#		  build-gtk-univ-stamp

-build_indep_stamps  = build-examples-stamp build-doc-stamp
+build_indep_stamps=build-examples-stamp build-doc-stamp

-build_cross_stamps  = build-msw-shared-stamp build-msw-static-stamp build-msw-dbg-stamp
+build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
+		   build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
+		   build-msw-static-stamp build-msw-dbg-stamp

-build_stamps_native = $(build_arch_stamps) $(build_indep_stamps)
-
-build_stamps = $(build_stamps_native) $(build_cross_stamps)
+build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)

+build_stamps=$(build_stamps_native) $(build_cross_stamps)

 # Install targets:
-install_all_arch = install-gtk-lib install-gtk-dev install-gtk-dbg        \
-                   install-gtk-contrib install-gtk-contrib-dev            \
-                   install-headers install-i18n install-gtk-py
+install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
+                 install-gtk-lib install-gtk-dev install-gtk-dbg \
+                 install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
+                 install-headers install-i18n

-install_all_indep  = install-examples install-doc
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#                install-gtk-univ

-install_all_cross  = install-msw-dev install-msw-dbg install-headers-msw
+install_all_indep=install-examples install-doc

-install_all_native = $(install_all_arch) $(install_all_indep)
+install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw

-install_all = $(install_all_native) $(install_all_cross)
+install_all_native=$(install_all_arch) $(install_all_indep)
+
+install_all=$(install_all_native) $(install_all_cross)


-wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config          \
-                --prefix=$(shell pwd)                            \
+wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
+                --prefix=$(shell pwd) \
                --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)

-contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
-

 # The Rules:

 debian/control: debian/control.in
-	sed -e 's/=V/$(release)/g;s/=PY/$(python_ver)/g' < debian/control.in > debian/control
+	sed -e 's/=V/$(release)/g' < debian/control.in > debian/control

 control-files-stamp: debian/control
 	dh_testdir
-	@for f in links postinst prerm; do                                   \
-		echo "generating control file $(package_gtk_dev).$$f";       \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f         \
-			> debian/$(package_gtk_dev).$$f;                     \
+	@for f in dirs postinst; do \
+		echo "generating control file $(package_wxbase_lib).$$f"; \
+		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
 	done;
-	@for f in links postinst prerm; do                                   \
-		echo "generating control file $(package_gtk_dbg).$$f";       \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f         \
-			> debian/$(package_gtk_dbg).$$f;                     \
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_dev).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
+			> debian/$(package_wxbase_dev).$$f; \
 	done;
-	@for f in dirs docs menu postinst prerm; do                          \
-		echo "generating control file $(package_gtk_py).$$f";        \
-		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g'             \
-			< debian/libwxgtk-python.$$f                         \
-			> debian/$(package_gtk_py).$$f;                      \
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
+			> debian/$(package_wxbase_dbg).$$f; \
 	done;
-	@for f in docs doc-base; do                                          \
-		echo "generating control file $(package_doc).$$f";           \
-		sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f               \
-			> debian/$(package_doc).$$f;                         \
+	@for f in dirs postinst; do \
+		echo "generating control file $(package_gtk_lib).$$f"; \
+		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
 	done;
-	@for f in examples; do                                               \
-		echo "generating control file $(package_examples).$$f";      \
-		cp debian/wx-examples.$$f debian/$(package_examples).$$f;    \
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_dev).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
+			> debian/$(package_gtk_dev).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do                              \
-		echo "generating control file $(package_msw_dev).$$f";       \
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
+			> debian/$(package_gtk_dbg).$$f; \
+	done;
+	@for f in dirs docs menu postinst prerm; do \
+		echo "generating control file $(package_gtk_py).$$f"; \
+		sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
+			> debian/$(package_gtk_py).$$f; \
+	done;
+	@for f in dirs postinst; do \
+		echo "generating control file $(package_gtk_contrib).$$f"; \
+		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
+	done;
+	@for f in dirs; do \
+		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
+		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
+	done;
+	@for f in dirs; do \
+		echo "generating control file $(package_headers).$$f"; \
+		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
+	done;
+	@for f in dirs; do \
+		echo "generating control file $(package_i18n).$$f"; \
+		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
+	done;
+	@for f in dirs docs doc-base; do \
+		echo "generating control file $(package_doc).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
+			> debian/$(package_doc).$$f; \
+	done;
+	@for f in examples; do \
+		echo "generating control file $(package_examples).$$f"; \
+		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
+			> debian/$(package_wxbase_msw_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dbg.$$f \
+			> debian/$(package_wxbase_msw_dbg).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dev).$$f"; \
 		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
-			> debian/$(package_msw_dev).$$f;                     \
+			> debian/$(package_msw_dev).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do                              \
-		echo "generating control file $(package_msw_dbg).$$f";       \
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dbg).$$f"; \
 		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
-			> debian/$(package_msw_dbg).$$f;                     \
+			> debian/$(package_msw_dbg).$$f; \
 	done;
-	@for f in dirs; do                                                   \
-		echo "generating control file $(package_headers_msw).$$f";   \
-		sed -e 's/=H/$(cross_host)/g' < debian/wx-headers-msw.$$f    \
-			> debian/$(package_headers_msw).$$f;                 \
+	@for f in dirs; do \
+		echo "generating control file $(package_headers_msw).$$f"; \
+		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
+			> debian/$(package_headers_msw).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_univ).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
+			> debian/$(package_gtk_univ).$$f; \
 	done;
 	touch $@

@@ -157,23 +231,69 @@ build_all: control-files-stamp $(build_stamps_native)
 build: build_arch


+configure-wxbase-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_shared)
+	cd $(objdir_wxbase_shared) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--disable-gui \
+				--enable-soname \
+				--with-zlib=sys
+	touch $@
+
+build-wxbase-shared-stamp: configure-wxbase-shared-stamp
+	dh_testdir
+	cd $(objdir_wxbase_shared) && $(MAKE)
+	touch $@
+
+configure-wxbase-static-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_static)
+	cd $(objdir_wxbase_static) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--disable-gui \
+				--disable-shared \
+				--with-zlib=sys
+	touch $@
+
+build-wxbase-static-stamp: configure-wxbase-static-stamp
+	dh_testdir
+	cd $(objdir_wxbase_static) && $(MAKE)
+	touch $@
+
+configure-wxbase-debug-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_debug)
+	cd $(objdir_wxbase_debug) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--disable-gui \
+				--enable-debug \
+				--enable-soname \
+				--with-zlib=sys
+	touch $@
+
+build-wxbase-debug-stamp: configure-wxbase-debug-stamp
+	dh_testdir
+	cd $(objdir_wxbase_debug) && $(MAKE)
+	touch $@
+
 configure-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
-		&& ../configure --prefix=/usr			\
-				--cache-file=$(config_cache)	\
-				--with-gtk			\
-				--enable-gtk2			\
-				--enable-unicode		\
-				--with-opengl			\
-				--enable-soname			\
-				--with-zlib=sys			\
-				--with-libjpeg=sys		\
-				--with-libpng=sys		\
-				--with-libtiff=sys		\
-				--enable-dynamic-loader		\
-				--enable-std_iostreams
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+				--enable-dynamic-loader
 	touch $@

 build-gtk-shared-stamp: configure-gtk-shared-stamp
@@ -185,19 +305,16 @@ configure-gtk-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
-		&& ../configure --prefix=/usr			\
-				--cache-file=$(config_cache)	\
-				--with-gtk			\
-				--enable-gtk2			\
-				--enable-unicode		\
-				--with-opengl			\
-				--disable-shared		\
-				--with-zlib=sys			\
-				--with-libjpeg=sys		\
-				--with-libpng=sys		\
-				--with-libtiff=sys		\
-				--enable-dynamic-loader		\
-				--enable-std_iostreams
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--disable-shared \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+				--enable-dynamic-loader
 	touch $@

 build-gtk-static-stamp: configure-gtk-static-stamp
@@ -209,20 +326,17 @@ configure-gtk-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_debug)
 	cd $(objdir_gtk_debug) \
-		&& ../configure --prefix=/usr			\
-				--cache-file=$(config_cache)	\
-				--with-gtk			\
-				--enable-gtk2			\
-				--enable-unicode		\
-				--with-opengl			\
-				--enable-debug			\
-				--enable-soname			\
-				--with-zlib=sys			\
-				--with-libjpeg=sys		\
-				--with-libpng=sys		\
-				--with-libtiff=sys		\
-				--enable-dynamic-loader		\
-				--enable-std_iostreams
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-debug \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+				--enable-dynamic-loader
 	touch $@

 build-gtk-debug-stamp: configure-gtk-debug-stamp
@@ -230,41 +344,51 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
 	cd $(objdir_gtk_debug) && $(MAKE)
 	touch $@

+configure-gtk-univ-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_univ)
+	cd $(objdir_gtk_univ) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-universal \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+				--enable-dynamic-loader
+	touch $@
+
+build-gtk-univ-stamp: configure-gtk-univ-stamp
+	dh_testdir
+	cd $(objdir_gtk_univ) && $(MAKE)
+	touch $@

 build-contrib-shared-stamp: build-gtk-shared-stamp
 	dh_testdir
-	cd $(objdir_gtk_shared)/contrib/src && $(MAKE)
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(MAKE)
 	touch $@

 build-contrib-static-stamp: build-gtk-static-stamp
 	dh_testdir
-	cd $(objdir_gtk_static)/contrib/src && $(MAKE)
+	cd $(objdir_gtk_static)/contrib/src \
+		&& $(MAKE)
 	touch $@

 build-gtk-py-stamp: build-gtk-shared-stamp
 	dh_testdir
 	touch docs/lgpl.txt
-	cd wxPython/include/wx						\
-		&& for f in $(contrib_libs); do				\
-			$(RM) $$f;					\
-			ln -s ../../../contrib/include/wx/$$f .;	\
-		done
 	cd wxPython \
-		&& $(python_ver) ./setup.py 	build			\
-						WX_CONFIG='$(wxconfig)'	\
-						WXPORT=gtk2		\
-						UNICODE=1
-	cd wxPython/include/wx						\
-		&& for f in $(contrib_libs); do $(RM) $$f; done
-
+		&& ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
 	touch $@

 build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/utils/tex2rtf/src \
 		&& $(MAKE)
-	rm -rf $(objdir_doc)
-	rm -rf $(objdir_doc_cruft)
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
@@ -286,16 +410,19 @@ build-examples-stamp: build-gtk-shared-stamp
 	rm -f $(objdir_examples)/samples/Makefile
 	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples

-	cd $(objdir_examples)/samples					\
-		&& find -name 'Makefile.in' -exec rm -f '{}' ';'	\
-		&& for d in $$(find -type d); do			\
-			if [ -f $$d/makefile.unx ]; then		\
-				mv $$d/makefile.unx $$d/Makefile;	\
-			fi;						\
-		done							\
-
+	cp -a demos $(objdir_examples)
 	cp -a wxPython/demo $(objdir_examples)/wxPython
-
+	@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
+		(cd $$d \
+			&& mv Makefile.in Makefile \
+			&& rm -f configure* \
+			&& find -name 'Makefile.in' -exec rm -f '{}' ';' \
+			&& for f in $$(find -type d); do \
+				if [ -f $$f/makefile.unx ]; then \
+					mv $$f/makefile.unx $$f/Makefile; \
+				fi; \
+			done) \
+	done;
 	touch $@

 build-i18n-stamp: build-gtk-shared-stamp
@@ -309,6 +436,56 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@

+configure-wxbase-msw-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_shared)
+	cd $(objdir_wxbase_msw_shared) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui
+	touch $@
+
+build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
+	dh_testdir
+	cd $(objdir_wxbase_msw_shared) && $(MAKE)
+	touch $@
+
+configure-wxbase-msw-static-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_static)
+	cd $(objdir_wxbase_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--disable-shared
+	touch $@
+
+build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
+	dh_testdir
+	cd $(objdir_wxbase_msw_static) && $(MAKE)
+	touch $@
+
+# Note this builds dll only, since wxmsw static debug is > 130MB !
+configure-wxbase-msw-dbg-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_dbg)
+	cd $(objdir_wxbase_msw_dbg) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--enable-debug
+	touch $@
+
+build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
+	dh_testdir
+	cd $(objdir_wxbase_msw_dbg) && $(MAKE)
+	touch $@

 configure-msw-shared-stamp:
 	dh_testdir
@@ -376,14 +553,14 @@ clean: debian/control
 		&& rm -rf contrib/xrc/contrib \
 		&& rm -rf *.pyc

-	cd wxPython/include/wx						\
-		&& for f in $(contrib_libs); do $(RM) $$f; done
-
 # We do the equivalent of this above by removing build, unfortunately
 # its not enough by itself to get the tree properly clean again.
 #		&& ./setup.py clean

 	dh_clean
+	rm -f debian/$(package_wxbase_lib).*
+	rm -f debian/$(package_wxbase_dev).*
+	rm -f debian/$(package_wxbase_dbg).*
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
 	rm -f debian/$(package_gtk_dbg).*
@@ -394,6 +571,9 @@ clean: debian/control
 	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
+	rm -f debian/$(package_gtk_univ).*
+	rm -f debian/$(package_wxbase_msw_dev).*
+	rm -f debian/$(package_wxbase_msw_dbg).*
 	rm -f debian/$(package_msw_dev).*
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/$(package_headers_msw).*
@@ -402,6 +582,34 @@ install_arch: build_arch $(install_all_arch)

 install: build_all $(install_all_native)

+install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
+install-wxbase-lib: build-wxbase-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install $(objdir_wxbase_shared)/lib/*.so.* 	usr/lib
+
+install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
+install-wxbase-dev: build-wxbase-static-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config 	usr/bin
+	dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} 		usr/lib
+	dh_install $(objdir_wxbase_static)/lib/*.a 			usr/lib
+
+install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
+install-wxbase-dbg: build-wxbase-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config 	usr/bin
+	dh_install $(objdir_wxbase_debug)/lib 				usr
+	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
+
 install-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_install)
@@ -424,20 +632,29 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_install)/bin/wxgtk2u-$(release)-config 	usr/bin
+	dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_install)/lib/{wx,*.so} 			usr/lib
-	dh_install $(objdir_gtk_static)/lib/libwx_gtk2u{-,_gl}*.a 	usr/lib
+	dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a 	usr/lib

 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs usr/share/lintian/overrides
-	dh_install $(objdir_gtk_debug)/wxgtk2ud-$(release)-config 	usr/bin
+	dh_installdirs
+	dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)

+install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
+install-gtk-univ: build-gtk-univ-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install $(objdir_gtk_univ)/wxgtkuniv-$(release)-config 	usr/bin
+	dh_install $(objdir_gtk_univ)/lib 				usr
+	cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)

 install-gtk-contrib-stamp:
 	dh_testdir
@@ -462,7 +679,7 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
 	dh_installdirs
 	dh_install $(objdir_gtk_contrib_install)/include 	usr
 	dh_install $(objdir_gtk_contrib_install)/lib/*.so 	usr/lib
-	dh_install -Xlibwx_gtk2u- -Xlibwx_gtk2u_gl- \
+	dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
 		   $(objdir_gtk_static)/lib/*.a 		usr/lib

 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
@@ -471,30 +688,21 @@ install-gtk-py: build-gtk-py-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cd wxPython 								\
-		&& $(python_ver) ./setup.py install 				\
-			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr 	\
-			      WX_CONFIG='$(wxconfig)'				\
-			      WXPORT=gtk2					\
-			      UNICODE=1
-
-	find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython \
+	cd wxPython \
+		&& ./setup.py install \
+			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr \
+			      WX_CONFIG='$(wxconfig)'
+	find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
 		-name '*.py?' -exec rm '{}' ';'

 	dh_installman debian/wxPython-tools.1
-	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1      \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
-
-	# This is rather bogus, its included in the main copyright file now though.
-	rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wx/tools/XRCed/license.txt
+	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1  \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1   \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1

 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-shared-stamp
@@ -538,6 +746,27 @@ install-examples: build-examples-stamp
 	dh_clean -k
 	dh_installdirs

+install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
+install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_shared)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp -a $(objdir_wxbase_msw_static)/lib/*.a debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_shared)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-wxbase-msw-dbg: DH_OPTIONS=-p$(package_wxbase_msw_dbg)
+install-wxbase-msw-dbg: build-wxbase-msw-dbg-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_dbg)/lib/* debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_dbg)/wxbased-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dbg)/usr/bin/
+	# No static lib, they're freakin' huge!
+	#$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib/*.a

 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
 install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
@@ -591,13 +820,15 @@ binary-common:

 	@# Don't strip debug libs at all, and strip cross libs elsewhere
 	@# with the cross host tools until dh_strip gets smarter.
-	dh_strip -N$(package_gtk_dbg) -N$(package_msw_dev) -N$(package_msw_dbg)
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+		 -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) \
+		 -N$(package_msw_dev) -N$(package_msw_dbg)

 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -N$(package_gtk_py) -V
 	dh_installdeb
-	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib:debian/$(package_gtk_contrib)/usr/lib
+	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -607,13 +838,13 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-i -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
 		binary-common

 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-a -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
 		binary-common

 # Build all packages target.
@@ -626,7 +857,7 @@ binary: binary-arch binary-indep
 # that is not in the control file.
 binary-cross: control-files-stamp $(install_all_cross)
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
+		DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_wxbase_msw_dbg) -p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
 		binary-common


@@ -650,6 +881,20 @@ binary-gtk-dev: control-files-stamp install-gtk-dev install-headers
 binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers
 	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common

+# libwxbase shared lib package
+binary-wxbase: control-files-stamp install-wxbase-lib install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_headers)" binary-common
+
+binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
+	$(MAKE) -f debian/rules \
+	  DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_wxbase_dev) -p$(package_headers)" \
+	  binary-common
+
+binary-wxbase-dbg: control-files-stamp install-wxbase-dbg install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_headers)" binary-common
+
+binary-univ: control-files-stamp install-gtk-univ
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_univ)" binary-common

 # docs package
 binary-doc: control-files-stamp install-doc
@@ -660,9 +905,12 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers


 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
-        binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
-	install install_arch install-gtk-lib install-gtk-dev \
+        binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
+	binary-wxbase-dbg binary-doc binary-cross \
+	install install_arch install-wxbase-lib \
+        install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
        install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
        install-gtk-py install-headers install-i18n install-doc install-examples \
-	install-msw-dev install-msw-dbg install-headers-msw
+	install-wxbase-msw-dev install-msw-dev install-headers-msw \
+	install-wxbase-msw-dbg install-msw-dbg

--- a/debian/wx-config.1
+++ b/debian/wx-config.1
@@ -1,6 +1,6 @@
-.TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWidgets"
+.TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows"
 .SH NAME
-wx-config \- generate compile time requirements for wxWidgets applications
+wx-config \- generate compile time info for wxWindows
 .SH SYNOPSIS
 .nh
 .B wxbase\-config
@@ -8,11 +8,11 @@ wx-config \- generate compile time requirements for wxWidgets applications
 .B wxgtk\-config
 .HP
 .B wx\-config
-[\-\-version] [\-\-libs\fI[=LIBS]\fP] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
-[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-release] [\-\-basename]
+[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
+[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
 .SH DESCRIPTION
 \fIwx\-config\fP is a tool to determine the compiler and linker
-flags required for applications using the \fIwxWidgets\fP toolkit(s).
+flags required for applications using the \fIwxWindows\fP toolkit(s).
 .PP
 \fIwx\-config\fP is normally a symlink to one of the port\-specific
 versions like \fIwxbase\-config\fP or \fIwxgtk\-config\fP which
@@ -26,32 +26,31 @@ mechanism.
 .SH OPTIONS
 .l
 \fIwx\-config\fP accepts the following options:
-.TP 15
+.TP 8
 .B  \-\-version
 What to
 .B ALWAYS
 include in a bug report.
-.TP 15
-.B  \-\-libs[=LIBS]
-Generate linker flags for a \fIwxWidgets\fP program.
-The optional argument is a comma separated list of the wxWidgets libraries
-to link with.  You may include contrib libs here too.  If no argument is
-given it will assume you wish to link all 'core' libraries.
-.TP 15
+.br
+( But of course you already knew that ... )
+.TP 8
+.B  \-\-libs
+Generate linker flags for a \fIwxWindows\fP program.
+.TP 8
 .B  \-\-cflags
 Generate compiler flags for the same.
-.TP 15
+.TP 8
 .B  \-\-cc
 Output the name of the C compiler \fB$(CC)\fP.
-.TP 15
+.TP 8
 .B  \-\-cxx
 Output the name of the C++ compiler \fB$(CXX)\fP.
-.TP 15
+.TP 8
 .B  \-\-ld
 Output the Linker command \fB$(LD)\fP.
-.TP 15
+.TP 8
 .B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIwxWidgets\fP
+If specified, use PREFIX instead of the installation prefix that \fIwxWindows\fP
 was built with when computing the output for the \-\-cflags and
 \-\-libs options. This option is also used for the exec prefix
 if \-\-exec\-prefix was not specified. This option must be specified
@@ -59,33 +58,27 @@ before any \-\-libs or \-\-cflags options.
 .br
 .nh
 .HP
-(Translation:  this is the root path to the \fIwxWidgets\fP headers \-\- [Ron])
+(Translation:  this is the root path to the \fIwxWindows\fP headers \-\- [Ron])
 .hy
-.TP 15
+.TP 8
 .B  \-\-exec\-prefix=PREFIX
 If specified, use PREFIX instead of the installation exec prefix that
-\fIwxWidgets\fP was built with when computing the output for the \-\-cflags
+\fIwxWindows\fP was built with when computing the output for the \-\-cflags
 and \-\-libs options.  This option must be specified before any
 \-\-libs or \-\-cflags options.
 .br
 .nh
 .HP
-(Translation:  this is the root path to the \fIwxWidgets\fP library \-\- [Ron])
+(Translation:  this is the root path to the \fIwxWindows\fP library \-\- [Ron])
 .hy
-.TP 15
-.B  \-\-release
-Output the wxWidgets release number.
-.TP 15
-.B  \-\-basename
-Output the base name of the wxWidgets libraries.
 .SH SEE ALSO
 .BR gtk\-config (1),
 .BR update\-alternatives (8)
 .SH COPYRIGHT
 This manpage was copied whole\-heartedly from the \fBgtk\-config\fP(1) manpage
 by Brian Bassett <brianb@debian.org> for the Debian GNU/Linux distribution of
-wxGTK.  It was subsequently updated to include new options and otherwise
-bastardised generally by Ron Lee <ron@debian.org>
+wxGTK.  It was then updated to include new options and otherwise bastardised
+generally by Ron Lee <ron@debian.org>

 The original gtk\-config manpage copyright:

--- a/debian/wx-doc.doc-base
+++ b/debian/wx-doc.doc-base
@@ -1,10 +0,0 @@
-Document: wx-manual
-Title: wxWidgets Programming Manual
-Author: The wxWidgets Cabal
-Abstract: This manual describes the wxWidgets cross-platform GUI toolkit.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/wx=V-doc/wx-manual.html/wxwin.htm
-Files: /usr/share/doc/wx=V-doc/wx-manual.html/*
-
--- a/debian/wx-doc.docs
+++ b/debian/wx-doc.docs
@@ -1,2 +0,0 @@
-docs/wx-manual.html
-
--- a/debian/wxPython-tools.1
+++ b/debian/wxPython-tools.1
@@ -1,4 +1,4 @@
-.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWidgets"
+.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWindows"
 .SH NAME
 img2py \- wxPython tools.
 .br
@@ -22,6 +22,6 @@ The real documentation for these tools is available in pydoc format.

 .SH COPYRIGHT
 This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
-distribution of wxWidgets.  It may be freely distributed by anyone insane enough
+distribution of wxWindows.  It may be freely distributed by anyone insane enough
 to find it useful.

--- a/debian/wxwin-doc.dirs
+++ b/debian/wxwin-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc-base
--- a/debian/wxwin-doc.doc-base
+++ b/debian/wxwin-doc.doc-base
@@ -0,0 +1,10 @@
+Document: wxwindows-manual
+Title: wxWindows Programming Manual
+Author: The wxWindows Cabal
+Abstract: This manual describes the wxWindows cross-platform GUI toolkit.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/wxwin.htm
+Files: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/*
+
--- a/debian/wxwin-doc.docs
+++ b/debian/wxwin-doc.docs
@@ -0,0 +1,2 @@
+docs/wxWindows-manual.html
+
--- a/debian/wxwin-examples.examples
+++ b/debian/wxwin-examples.examples
@@ -1,4 +1,3 @@
-debian/README.examples
+docs/examples/demos
 docs/examples/samples
 docs/examples/wxPython
-
--- a/debian/wxwin-headers-msw.dirs
+++ b/debian/wxwin-headers-msw.dirs
--- a/debian/wxwin-headers.dirs
+++ b/debian/wxwin-headers.dirs
@@ -0,0 +1,3 @@
+usr/include/wx
+usr/share/man/man1
+
--- a/debian/wxwin-i18n.dirs
+++ b/debian/wxwin-i18n.dirs
@@ -0,0 +1,2 @@
+/usr/share/locale
+
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -127,7 +127,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \

 ### Targets: ###

-all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname) data_help_std data_help_png
+all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname)

 install: all

@@ -174,22 +174,6 @@ dbbrowse.app/Contents/PkgInfo: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plis

@COND_PLATFORM_MACOSX_1@dbbrowse_bundle: dbbrowse.app/Contents/PkgInfo

-data_help_std: 
-	@mkdir -p ./help.std
-	@for f in compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm; do \
-	if test \( ! -s ./help.std/$$f \) -o \( $(srcdir)/help.std/$$f -nt ./help.std/$$f  \) ; then \
-	cp -pRf $(srcdir)/help.std/$$f ./help.std ; \
-	fi; \
-	done
-
-data_help_png: 
-	@mkdir -p ./help.png
-	@for f in col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png; do \
-	if test \( ! -s ./help.png/$$f \) -o \( $(srcdir)/help.png/$$f -nt ./help.png/$$f  \) ; then \
-	cp -pRf $(srcdir)/help.png/$$f ./help.png ; \
-	fi; \
-	done
-
 dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp
 	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<

@@ -221,4 +205,4 @@ dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.rc
 # Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d

-.PHONY: all install uninstall clean distclean dbbrowse_bundle data_help_std data_help_png
+.PHONY: all install uninstall clean distclean dbbrowse_bundle
--- a/demos/dbbrowse/dbbrowse.bkl
+++ b/demos/dbbrowse/dbbrowse.bkl
@@ -23,62 +23,4 @@
        <win32-res>dbbrowse.rc</win32-res>
    </exe>

-    <wx-data id="data_help_std">
-        <dstdir>$(BUILDDIR)/help.std</dstdir>
-        <srcdir>$(SRCDIR)/help.std</srcdir>
-        <files>
-            compiler.htm
-            dbbrowse.hhc
-            dbbrowse.hhk
-            dbbrowse.hhp
-            dbbrowse.htm
-            getcol.htm
-            getcolsh.htm
-            icons.htm
-            picgrams.htm
-            problems.htm
-            remstar.htm
-            sample.htm
-            startprm.htm
-            todo.htm
-            wxdb.htm
-            wxtable.htm
-        </files>
-    </wx-data>
-
-    <wx-data id="data_help_png">
-        <dstdir>$(BUILDDIR)/help.png</dstdir>
-        <srcdir>$(SRCDIR)/help.png</srcdir>
-        <files>
-            col.png
-            d_closed.png
-            d_open.png
-            dsn.png
-            dsnclose.png
-            dsnopen.png
-            f_closed.png
-            f_open.png
-            gnu.png
-            gtk.png
-            imbau.png
-            kde.png
-            key.png
-            keyf.png
-            linux.png
-            logo.png
-            motif.png
-            msvc.png
-            odbc.png
-            pgmctrl.png
-            redh.png
-            remstar.png
-            server.png
-            suse.png
-            tab.png
-            view.png
-            winnt.png
-            wins.png
-        </files>
-    </wx-data>
-
 </makefile>
--- a/demos/dbbrowse/makefile.bcc
+++ b/demos/dbbrowse/makefile.bcc
@@ -174,7 +174,7 @@ $(OBJS):

 ### Targets: ###

-all: $(OBJS)\dbbrowse.exe data_help_std data_help_png
+all: $(OBJS)\dbbrowse.exe

 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -191,14 +191,6 @@ $(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS)  $(OBJS)\dbbrowse_dbbrowse.res
 	c0w32.obj $(DBBROWSE_OBJECTS),$@,, $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dbbrowse_dbbrowse.res
 |

-data_help_std: 
-	if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-	for %f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%f copy .\help.std\%f $(OBJS)\help.std
-
-data_help_png: 
-	if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-	for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png
-
 $(OBJS)\dbbrowse_dbbrowse.obj: .\dbbrowse.cpp
 	$(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**

--- a/demos/dbbrowse/makefile.gcc
+++ b/demos/dbbrowse/makefile.gcc
@@ -182,7 +182,7 @@ $(OBJS):

 ### Targets: ###

-all: $(OBJS)\dbbrowse.exe data_help_std data_help_png
+all: $(OBJS)\dbbrowse.exe

 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -191,14 +191,6 @@ clean:
 $(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse_rc.o
 	$(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32

-data_help_std: 
-	if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-	for %%f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%%f copy .\help.std\%%f $(OBJS)\help.std
-
-data_help_png: 
-	if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-	for %%f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%%f copy .\help.png\%%f $(OBJS)\help.png
-
 $(OBJS)\dbbrowse_dbbrowse.o: ./dbbrowse.cpp
 	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<

@@ -226,4 +218,4 @@ $(OBJS)\dbbrowse_dlguser.o: ./dlguser.cpp
 $(OBJS)\dbbrowse_dbbrowse_rc.o: ./dbbrowse.rc
 	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples

-.PHONY: all clean data_help_std data_help_png
+.PHONY: all clean
--- a/demos/dbbrowse/makefile.vc
+++ b/demos/dbbrowse/makefile.vc
@@ -261,7 +261,7 @@ $(OBJS):

 ### Targets: ###

-all: $(OBJS)\dbbrowse.exe data_help_std data_help_png
+all: $(OBJS)\dbbrowse.exe

 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -275,14 +275,6 @@ $(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse.res
 	$(DBBROWSE_OBJECTS)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
 <<

-data_help_std: 
-	if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-	for %f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%f copy .\help.std\%f $(OBJS)\help.std
-
-data_help_png: 
-	if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-	for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png
-
 $(OBJS)\dbbrowse_dbbrowse.obj: .\dbbrowse.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**

--- a/demos/dbbrowse/makefile.wat
+++ b/demos/dbbrowse/makefile.wat
@@ -213,7 +213,7 @@ $(OBJS) :

 ### Targets: ###

-all : .SYMBOLIC $(OBJS)\dbbrowse.exe data_help_std data_help_png
+all : .SYMBOLIC $(OBJS)\dbbrowse.exe

 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -233,14 +233,6 @@ $(OBJS)\dbbrowse.exe :  $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse.res
 	@%append $(OBJS)\dbbrowse.lbc option resource=$(OBJS)\dbbrowse_dbbrowse.res
 	wlink @$(OBJS)\dbbrowse.lbc

-data_help_std : .SYMBOLIC 
-	if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-	for %f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%f copy .\help.std\%f $(OBJS)\help.std
-
-data_help_png : .SYMBOLIC 
-	if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-	for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png
-
 $(OBJS)\dbbrowse_dbbrowse.obj :  .AUTODEPEND .\dbbrowse.cpp
 	$(CXX) -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<

--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -36,7 +36,6 @@
 #include "corner2.xpm"
 #include "corner3.xpm"
 #include "corner4.xpm"
-#include "wxpoem.xpm"
 #endif

 #define         buf_size 10000
@@ -489,7 +488,7 @@ void MainWindow::Search(bool ask)
    {
      s.MakeLower();
      if (search_string) delete[] search_string;
-      search_string = wxStrcpy(new wxChar[wxStrlen(s.c_str()) + 1], s.c_str());
+      search_string = copystring(s);
      search_ok = true;
    } else search_ok = false;
  }
@@ -554,8 +553,8 @@ bool MyApp::OnInit()

  if (argc > 1)
  {
-    index_filename = wxStrcpy(new wxChar[wxStrlen(argv[1]) + 1], argv[1]);
-    data_filename = wxStrcpy(new wxChar[wxStrlen(argv[1]) + 1], argv[1]);
+    index_filename = copystring(argv[1]);
+    data_filename = copystring(argv[1]);
  }
  else
  {
--- a/descrip.mms
+++ b/descrip.mms
@@ -11,7 +11,7 @@
 	wx_sub = f$element(0,"]",wx_curdir)
 	wx_fuldir = "''wx_sub'.]"
 	define/job/trans=(concealed) wx_root "''wx_fuldir'"
-	set def [.wxwidgets]
+	set def [.wxwindows]

 all :
 	set default [.include.wx]
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1,2 @@`
				`usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz`
				`@@ -0,0 +1 @@`
				`usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz`