Get rid of v2.8 code

Makefile.in

@@ -3920,7 +3920,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/dnd.h \
 	wx/docmdi.h \
 	wx/docview.h \
-	wx/effects.h \
 	wx/fdrepdlg.h \
 	wx/filectrl.h \
 	wx/filehistory.h \
@@ -4565,7 +4564,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_docview.o \
 	monodll_dpycmn.o \
 	monodll_dseldlg.o \
-	monodll_effects.o \
 	monodll_fddlgcmn.o \
 	monodll_filectrlcmn.o \
 	monodll_filehistorycmn.o \
@@ -4829,7 +4827,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_docview.o \
 	monodll_dpycmn.o \
 	monodll_dseldlg.o \
-	monodll_effects.o \
 	monodll_fddlgcmn.o \
 	monodll_filectrlcmn.o \
 	monodll_filehistorycmn.o \
@@ -6576,7 +6573,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_docview.o \
 	monolib_dpycmn.o \
 	monolib_dseldlg.o \
-	monolib_effects.o \
 	monolib_fddlgcmn.o \
 	monolib_filectrlcmn.o \
 	monolib_filehistorycmn.o \
@@ -6840,7 +6836,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_docview.o \
 	monolib_dpycmn.o \
 	monolib_dseldlg.o \
-	monolib_effects.o \
 	monolib_fddlgcmn.o \
 	monolib_filectrlcmn.o \
 	monolib_filehistorycmn.o \
@@ -8741,7 +8736,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_docview.o \
 	coredll_dpycmn.o \
 	coredll_dseldlg.o \
-	coredll_effects.o \
 	coredll_fddlgcmn.o \
 	coredll_filectrlcmn.o \
 	coredll_filehistorycmn.o \
@@ -9005,7 +8999,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_docview.o \
 	coredll_dpycmn.o \
 	coredll_dseldlg.o \
-	coredll_effects.o \
 	coredll_fddlgcmn.o \
 	coredll_filectrlcmn.o \
 	coredll_filehistorycmn.o \
@@ -10479,7 +10472,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_docview.o \
 	corelib_dpycmn.o \
 	corelib_dseldlg.o \
-	corelib_effects.o \
 	corelib_fddlgcmn.o \
 	corelib_filectrlcmn.o \
 	corelib_filehistorycmn.o \
@@ -10743,7 +10735,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_docview.o \
 	corelib_dpycmn.o \
 	corelib_dseldlg.o \
-	corelib_effects.o \
 	corelib_fddlgcmn.o \
 	corelib_filectrlcmn.o \
 	corelib_filehistorycmn.o \
@@ -20642,9 +20633,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
 
-@COND_USE_GUI_1@monodll_effects.o: $(srcdir)/src/common/effects.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-
 @COND_USE_GUI_1@monodll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
 
@@ -25964,9 +25952,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
 
-@COND_USE_GUI_1@monolib_effects.o: $(srcdir)/src/common/effects.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-
 @COND_USE_GUI_1@monolib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
 
@@ -31391,9 +31376,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
 
-@COND_USE_GUI_1@coredll_effects.o: $(srcdir)/src/common/effects.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-
 @COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
 
@@ -35672,9 +35654,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
 
-@COND_USE_GUI_1@corelib_effects.o: $(srcdir)/src/common/effects.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/effects.cpp
-
 @COND_USE_GUI_1@corelib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
 

build/bakefiles/files.bkl

@@ -852,7 +852,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/docview.cpp
     src/common/dpycmn.cpp
     src/common/dseldlg.cpp
-    src/common/effects.cpp
     src/common/fddlgcmn.cpp
     src/common/filectrlcmn.cpp
     src/common/filehistorycmn.cpp
@@ -1167,7 +1166,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
-    wx/effects.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h

build/cmake/files.cmake

@@ -755,7 +755,6 @@ set(GUI_CMN_SRC
     src/common/docview.cpp
     src/common/dpycmn.cpp
     src/common/dseldlg.cpp
-    src/common/effects.cpp
     src/common/fddlgcmn.cpp
     src/common/filectrlcmn.cpp
     src/common/filehistorycmn.cpp
@@ -1074,7 +1073,6 @@ set(GUI_CMN_HDR
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
-    wx/effects.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h

build/msw/makefile.gcc

@@ -2050,7 +2050,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_docview.o \
 	$(OBJS)\monodll_dpycmn.o \
 	$(OBJS)\monodll_dseldlg.o \
-	$(OBJS)\monodll_effects.o \
 	$(OBJS)\monodll_fddlgcmn.o \
 	$(OBJS)\monodll_filectrlcmn.o \
 	$(OBJS)\monodll_filehistorycmn.o \
@@ -2383,7 +2382,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_docview.o \
 	$(OBJS)\monodll_dpycmn.o \
 	$(OBJS)\monodll_dseldlg.o \
-	$(OBJS)\monodll_effects.o \
 	$(OBJS)\monodll_fddlgcmn.o \
 	$(OBJS)\monodll_filectrlcmn.o \
 	$(OBJS)\monodll_filehistorycmn.o \
@@ -2900,7 +2898,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_docview.o \
 	$(OBJS)\monolib_dpycmn.o \
 	$(OBJS)\monolib_dseldlg.o \
-	$(OBJS)\monolib_effects.o \
 	$(OBJS)\monolib_fddlgcmn.o \
 	$(OBJS)\monolib_filectrlcmn.o \
 	$(OBJS)\monolib_filehistorycmn.o \
@@ -3233,7 +3230,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_docview.o \
 	$(OBJS)\monolib_dpycmn.o \
 	$(OBJS)\monolib_dseldlg.o \
-	$(OBJS)\monolib_effects.o \
 	$(OBJS)\monolib_fddlgcmn.o \
 	$(OBJS)\monolib_filectrlcmn.o \
 	$(OBJS)\monolib_filehistorycmn.o \
@@ -3632,7 +3628,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_docview.o \
 	$(OBJS)\coredll_dpycmn.o \
 	$(OBJS)\coredll_dseldlg.o \
-	$(OBJS)\coredll_effects.o \
 	$(OBJS)\coredll_fddlgcmn.o \
 	$(OBJS)\coredll_filectrlcmn.o \
 	$(OBJS)\coredll_filehistorycmn.o \
@@ -3965,7 +3960,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_docview.o \
 	$(OBJS)\coredll_dpycmn.o \
 	$(OBJS)\coredll_dseldlg.o \
-	$(OBJS)\coredll_effects.o \
 	$(OBJS)\coredll_fddlgcmn.o \
 	$(OBJS)\coredll_filectrlcmn.o \
 	$(OBJS)\coredll_filehistorycmn.o \
@@ -4321,7 +4315,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_docview.o \
 	$(OBJS)\corelib_dpycmn.o \
 	$(OBJS)\corelib_dseldlg.o \
-	$(OBJS)\corelib_effects.o \
 	$(OBJS)\corelib_fddlgcmn.o \
 	$(OBJS)\corelib_filectrlcmn.o \
 	$(OBJS)\corelib_filehistorycmn.o \
@@ -4654,7 +4647,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_docview.o \
 	$(OBJS)\corelib_dpycmn.o \
 	$(OBJS)\corelib_dseldlg.o \
-	$(OBJS)\corelib_effects.o \
 	$(OBJS)\corelib_fddlgcmn.o \
 	$(OBJS)\corelib_filectrlcmn.o \
 	$(OBJS)\corelib_filehistorycmn.o \
@@ -8682,11 +8674,6 @@ $(OBJS)\monodll_dseldlg.o: ../../src/common/dseldlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_effects.o: ../../src/common/effects.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_fddlgcmn.o: ../../src/common/fddlgcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11277,11 +11264,6 @@ $(OBJS)\monolib_dseldlg.o: ../../src/common/dseldlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_effects.o: ../../src/common/effects.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_fddlgcmn.o: ../../src/common/fddlgcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13839,11 +13821,6 @@ $(OBJS)\coredll_dseldlg.o: ../../src/common/dseldlg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_effects.o: ../../src/common/effects.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_fddlgcmn.o: ../../src/common/fddlgcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -15594,11 +15571,6 @@ $(OBJS)\corelib_dseldlg.o: ../../src/common/dseldlg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_effects.o: ../../src/common/effects.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_fddlgcmn.o: ../../src/common/fddlgcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

build/msw/makefile.vc

@@ -2377,7 +2377,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_docview.obj \
 	$(OBJS)\monodll_dpycmn.obj \
 	$(OBJS)\monodll_dseldlg.obj \
-	$(OBJS)\monodll_effects.obj \
 	$(OBJS)\monodll_fddlgcmn.obj \
 	$(OBJS)\monodll_filectrlcmn.obj \
 	$(OBJS)\monodll_filehistorycmn.obj \
@@ -2708,7 +2707,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_docview.obj \
 	$(OBJS)\monodll_dpycmn.obj \
 	$(OBJS)\monodll_dseldlg.obj \
-	$(OBJS)\monodll_effects.obj \
 	$(OBJS)\monodll_fddlgcmn.obj \
 	$(OBJS)\monodll_filectrlcmn.obj \
 	$(OBJS)\monodll_filehistorycmn.obj \
@@ -3227,7 +3225,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_docview.obj \
 	$(OBJS)\monolib_dpycmn.obj \
 	$(OBJS)\monolib_dseldlg.obj \
-	$(OBJS)\monolib_effects.obj \
 	$(OBJS)\monolib_fddlgcmn.obj \
 	$(OBJS)\monolib_filectrlcmn.obj \
 	$(OBJS)\monolib_filehistorycmn.obj \
@@ -3558,7 +3555,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_docview.obj \
 	$(OBJS)\monolib_dpycmn.obj \
 	$(OBJS)\monolib_dseldlg.obj \
-	$(OBJS)\monolib_effects.obj \
 	$(OBJS)\monolib_fddlgcmn.obj \
 	$(OBJS)\monolib_filectrlcmn.obj \
 	$(OBJS)\monolib_filehistorycmn.obj \
@@ -4009,7 +4005,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_docview.obj \
 	$(OBJS)\coredll_dpycmn.obj \
 	$(OBJS)\coredll_dseldlg.obj \
-	$(OBJS)\coredll_effects.obj \
 	$(OBJS)\coredll_fddlgcmn.obj \
 	$(OBJS)\coredll_filectrlcmn.obj \
 	$(OBJS)\coredll_filehistorycmn.obj \
@@ -4340,7 +4335,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_docview.obj \
 	$(OBJS)\coredll_dpycmn.obj \
 	$(OBJS)\coredll_dseldlg.obj \
-	$(OBJS)\coredll_effects.obj \
 	$(OBJS)\coredll_fddlgcmn.obj \
 	$(OBJS)\coredll_filectrlcmn.obj \
 	$(OBJS)\coredll_filehistorycmn.obj \
@@ -4696,7 +4690,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_docview.obj \
 	$(OBJS)\corelib_dpycmn.obj \
 	$(OBJS)\corelib_dseldlg.obj \
-	$(OBJS)\corelib_effects.obj \
 	$(OBJS)\corelib_fddlgcmn.obj \
 	$(OBJS)\corelib_filectrlcmn.obj \
 	$(OBJS)\corelib_filehistorycmn.obj \
@@ -5027,7 +5020,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_docview.obj \
 	$(OBJS)\corelib_dpycmn.obj \
 	$(OBJS)\corelib_dseldlg.obj \
-	$(OBJS)\corelib_effects.obj \
 	$(OBJS)\corelib_fddlgcmn.obj \
 	$(OBJS)\corelib_filectrlcmn.obj \
 	$(OBJS)\corelib_filehistorycmn.obj \
@@ -9137,11 +9129,6 @@ $(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
@@ -11732,11 +11719,6 @@ $(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
@@ -14294,11 +14276,6 @@ $(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp
@@ -16049,11 +16026,6 @@ $(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\effects.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp

build/msw/wx_core.vcxproj

@@ -500,7 +500,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\effects.cpp" />
     <ClCompile Include="..\..\src\common\event.cpp" />
     <ClCompile Include="..\..\src\common\fddlgcmn.cpp" />
     <ClCompile Include="..\..\src\common\filectrlcmn.cpp" />
@@ -1303,7 +1302,6 @@
     <ClInclude Include="..\..\include\wx\docmdi.h" />
     <ClInclude Include="..\..\include\wx\docview.h" />
     <ClInclude Include="..\..\include\wx\dragimag.h" />
-    <ClInclude Include="..\..\include\wx\effects.h" />
     <ClInclude Include="..\..\include\wx\encinfo.h" />
     <ClInclude Include="..\..\include\wx\fdrepdlg.h" />
     <ClInclude Include="..\..\include\wx\filectrl.h" />
@@ -1523,4 +1521,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/msw/wx_core.vcxproj.filters

@@ -165,9 +165,6 @@
     <ClCompile Include="..\..\src\common\dummy.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\effects.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\common\event.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -1306,9 +1303,6 @@
     <ClInclude Include="..\..\include\wx\editlbox.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\effects.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\encinfo.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -2323,4 +2317,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>

build/msw/wx_vc8_core.vcproj

@@ -1053,10 +1053,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\effects.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\event.cpp"
 				>
@@ -3720,10 +3716,6 @@
 				RelativePath="..\..\include\wx\propgrid\editors.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\effects.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\encinfo.h"
 				>

build/msw/wx_vc9_core.vcproj

@@ -1049,10 +1049,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\effects.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\event.cpp"
 				>
@@ -3716,10 +3712,6 @@
 				RelativePath="..\..\include\wx\propgrid\editors.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\effects.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\encinfo.h"
 				>

build/osx/wxcocoa.xcodeproj/project.pbxproj

@@ -1652,7 +1652,6 @@
 		4156FDB73D0A397A870E4304 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; };
 		CD241361D4693785A0B8939E /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; };
 		6978D7A20DA93A329DDD1384 /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CE02524DD4385AB2C3DF95 /* socket.cpp */; };
-		447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; };
 		BFD3BFBDC8DA3B1EAD141F97 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A1276C0E5D48337489DEE8DF /* LexErlang.cxx */; };
 		096BA201623034AD97218369 /* tif_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E6F40F4740C3ED29D83E107 /* tif_version.c */; };
 		2386B575BC3931D2AF86CB34 /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */; };
@@ -2036,7 +2035,6 @@
 		55D893FDD00633FEA82ABD83 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */; };
 		45FE206BBAD13DDCA1EA41D1 /* treebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6ADD758693BD180D3275B /* treebase.cpp */; };
 		4D0BA8B9F72C3C31BC170CE4 /* progdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */; };
-		447FEC72F3C234378CE28DE8 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; };
 		6C46AF0370793AA0B74A5A4C /* tabmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */; };
 		3B7E035ECF3D3FFB9827AC1E /* xh_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06B4A895955B32258DCD62BF /* xh_dlg.cpp */; };
 		EC43AFB3670A3D459D9B388F /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FE3B47058A723243A285594D /* LexMPT.cxx */; };
@@ -2290,7 +2288,6 @@
 		894D43C8F224394FB3171F27 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */; };
 		BAA75384DA82370298672334 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; };
 		1D7442C82B343F50A83B25B1 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; };
-		447FEC72F3C234378CE28DE9 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; };
 		46CE8B53D2663927AAE5DF9F /* xh_treebk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */; };
 		98AD7D0478BA36249B03C625 /* time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B9586328A1F3C4BA0390AA5 /* time.cpp */; };
 		6944AC98F6F83E3D983DABD5 /* tif_getimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */; };
@@ -4071,7 +4068,6 @@
 		86884BC843F6337EABF744BB /* jdapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapimin.c; path = ../../src/jpeg/jdapimin.c; sourceTree = SOURCE_ROOT; };
 		087B66573CD33DA99DA82B1C /* xmlres.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlres.cpp; path = ../../src/xrc/xmlres.cpp; sourceTree = SOURCE_ROOT; };
 		0903EE9B3793303285FF96E3 /* textfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfile.cpp; path = ../../src/common/textfile.cpp; sourceTree = SOURCE_ROOT; };
-		48D72D20DB1D3E1CA5ED112A /* effects.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effects.cpp; path = ../../src/common/effects.cpp; sourceTree = SOURCE_ROOT; };
 		9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = SOURCE_ROOT; };
 		A57CF60203F53459A03951A9 /* arrstr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arrstr.cpp; path = ../../src/common/arrstr.cpp; sourceTree = SOURCE_ROOT; };
 		2A4D36DE66EC3EB09E883D6B /* taskbar.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = taskbar.mm; path = ../../src/osx/cocoa/taskbar.mm; sourceTree = SOURCE_ROOT; };
@@ -6006,7 +6002,6 @@
 				AB634FD597793A74B3B3AA7F /* docview.cpp */,
 				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
 				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
-				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
 				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
 				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
 				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
@@ -7918,7 +7913,6 @@
 				B1E30CF6CFA932F5A3DBA950 /* docview.cpp in Sources */,
 				F80C2290D67B345F9CF60086 /* dpycmn.cpp in Sources */,
 				6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */,
-				447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */,
 				C2E37E798F743A4199C8658F /* fddlgcmn.cpp in Sources */,
 				37715483D08335B790FFE059 /* filectrlcmn.cpp in Sources */,
 				0730A107A2B935A9923C8EF4 /* filehistorycmn.cpp in Sources */,
@@ -8606,7 +8600,6 @@
 				B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */,
 				F80C2290D67B345F9CF60087 /* dpycmn.cpp in Sources */,
 				6BF19C7CA9E93D989C210FE4 /* dseldlg.cpp in Sources */,
-				447FEC72F3C234378CE28DE8 /* effects.cpp in Sources */,
 				C2E37E798F743A4199C86590 /* fddlgcmn.cpp in Sources */,
 				37715483D08335B790FFE05A /* filectrlcmn.cpp in Sources */,
 				0730A107A2B935A9923C8EF3 /* filehistorycmn.cpp in Sources */,
@@ -9903,7 +9896,6 @@
 				B1E30CF6CFA932F5A3DBA951 /* docview.cpp in Sources */,
 				F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */,
 				6BF19C7CA9E93D989C210FE5 /* dseldlg.cpp in Sources */,
-				447FEC72F3C234378CE28DE9 /* effects.cpp in Sources */,
 				C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */,
 				37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */,
 				0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */,

build/osx/wxiphone.xcodeproj/project.pbxproj

@@ -446,7 +446,6 @@
 		A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */; };
 		AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D87406BCF3E833369E12D89A /* LexHTML.cxx */; };
 		23CECD8647C037E0B41DF0D4 /* LexA68k.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7020ADB5D3E0375E875B418B /* LexA68k.cxx */; };
-		447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; };
 		135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */; };
 		7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */; };
 		65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31F4B9B03D52339B8F82C114 /* variant.cpp */; };
@@ -1063,7 +1062,6 @@
 		1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = SOURCE_ROOT; };
 		68B81FBDA49D3C1991B6356A /* jdcolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcolor.c; path = ../../src/jpeg/jdcolor.c; sourceTree = SOURCE_ROOT; };
 		AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/iphone/nonownedwnd.mm; sourceTree = SOURCE_ROOT; };
-		48D72D20DB1D3E1CA5ED112A /* effects.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effects.cpp; path = ../../src/common/effects.cpp; sourceTree = SOURCE_ROOT; };
 		8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxcmn.cpp; path = ../../src/common/bmpcboxcmn.cpp; sourceTree = SOURCE_ROOT; };
 		194ADD28300E329E80F7892E /* htmprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmprint.cpp; path = ../../src/html/htmprint.cpp; sourceTree = SOURCE_ROOT; };
 		47FF6D792CA234C395692118 /* PlatWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlatWX.cpp; path = ../../src/stc/PlatWX.cpp; sourceTree = SOURCE_ROOT; };
@@ -2386,7 +2384,6 @@
 				AB634FD597793A74B3B3AA7F /* docview.cpp */,
 				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
 				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
-				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
 				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
 				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
 				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
@@ -3265,7 +3262,6 @@
 				B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */,
 				F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */,
 				6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */,
-				447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */,
 				C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */,
 				37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */,
 				0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */,

include/wx/anybutton.h

@@ -104,12 +104,6 @@ public:
     // in wxAnyButtonBase to make it consistent.
     virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
 
-    // wxUniv-compatible and deprecated equivalents to SetBitmapXXX()
-#if WXWIN_COMPATIBILITY_2_8
-    void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); }
-    void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // backwards compatible names for pressed/current bitmaps: they're not
     // deprecated as there is nothing really wrong with using them and no real
     // advantage to using the new names but the new names are still preferred

include/wx/artprov.h

@@ -144,11 +144,6 @@ public:
     // will be queried as the last one).
     static void PushBack(wxArtProvider *provider);
 
-#if WXWIN_COMPATIBILITY_2_8
-    // use PushBack(), it's the same thing
-    wxDEPRECATED( static void Insert(wxArtProvider *provider) );
-#endif
-
     // Remove latest added provider and delete it.
     static bool Pop();
 

include/wx/build.h

@@ -86,16 +86,16 @@
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
-#if WXWIN_COMPATIBILITY_2_8
-    #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8"
-#else
-    #define __WX_BO_WXWIN_COMPAT_2_8
-#endif
 #if WXWIN_COMPATIBILITY_3_0
     #define __WX_BO_WXWIN_COMPAT_3_0 ",compatible with 3.0"
 #else
     #define __WX_BO_WXWIN_COMPAT_3_0
 #endif
+#if WXWIN_COMPATIBILITY_3_2
+    #define __WX_BO_WXWIN_COMPAT_3_2 ",compatible with 3.2"
+#else
+    #define __WX_BO_WXWIN_COMPAT_3_2
+#endif
 
 // deriving wxWin containers from STL ones changes them completely:
 #if wxUSE_STD_CONTAINERS
@@ -110,7 +110,7 @@
     " (" __WX_BO_UNICODE \
      __WX_BO_COMPILER \
      __WX_BO_STL \
-     __WX_BO_WXWIN_COMPAT_2_8 __WX_BO_WXWIN_COMPAT_3_0 \
+     __WX_BO_WXWIN_COMPAT_3_0 __WX_BO_WXWIN_COMPAT_3_2 \
      ")"
 
 

include/wx/chkconf.h

@@ -1328,16 +1328,16 @@
    Section 3a: check consistency of the non-GUI settings.
  */
 
-#if WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_3_0
-#   if !WXWIN_COMPATIBILITY_3_0
+#   if !WXWIN_COMPATIBILITY_3_2
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "2.8.X compatibility requires 3.0.X compatibility"
+#           error "3.0.X compatibility requires 3.2.X compatibility"
 #       else
-#           undef WXWIN_COMPATIBILITY_3_0
+#           undef WXWIN_COMPATIBILITY_3_2
-#           define WXWIN_COMPATIBILITY_3_0 1
+#           define WXWIN_COMPATIBILITY_3_2 1
 #       endif
 #   endif
-#endif /* WXWIN_COMPATIBILITY_2_8 */
+#endif /* WXWIN_COMPATIBILITY_3_0 */
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME

include/wx/combo.h

@@ -357,19 +357,6 @@ public:
                            const wxBitmapBundle& bmpHover = wxBitmapBundle(),
                            const wxBitmapBundle& bmpDisabled = wxBitmapBundle() );
 
-#if WXWIN_COMPATIBILITY_2_8
-    //
-    // This will set the space in pixels between left edge of the control and the
-    // text, regardless whether control is read-only (ie. no wxTextCtrl) or not.
-    // Platform-specific default can be set with value-1.
-    // Remarks
-    // * This method may do nothing on some native implementations.
-    wxDEPRECATED( void SetTextIndent( int indent ) );
-
-    // Returns actual indentation in pixels.
-    wxDEPRECATED( wxCoord GetTextIndent() const );
-#endif
-
     // Returns area covered by the text field.
     const wxRect& GetTextRect() const
     {

include/wx/containr.h

@@ -296,138 +296,4 @@ protected:
     wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxNavigationEnabled, W);
 };
 
-// ----------------------------------------------------------------------------
-// Compatibility macros from now on, do NOT use them and preferably do not even
-// look at them.
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-
-// common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
-// it should be used in the wxWindow-derived class declaration
-#define WX_DECLARE_CONTROL_CONTAINER_BASE()                                   \
-public:                                                                       \
-    virtual bool AcceptsFocus() const;                                        \
-    virtual bool AcceptsFocusRecursively() const;                             \
-    virtual bool AcceptsFocusFromKeyboard() const;                            \
-    virtual void AddChild(wxWindowBase *child);                               \
-    virtual void RemoveChild(wxWindowBase *child);                            \
-    virtual void SetFocus();                                                  \
-    void SetFocusIgnoringChildren();                                          \
-                                                                              \
-protected:                                                                    \
-    wxControlContainer m_container
-
-// this macro must be used in the derived class ctor
-#define WX_INIT_CONTROL_CONTAINER() \
-    m_container.SetContainerWindow(this)
-
-// common part of WX_DELEGATE_TO_CONTROL_CONTAINER in the native and generic
-// cases, must be used in the wxWindow-derived class implementation
-#define WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename)            \
-    void classname::AddChild(wxWindowBase *child)                             \
-    {                                                                         \
-        basename::AddChild(child);                                            \
-                                                                              \
-        m_container.UpdateCanFocusChildren();                                 \
-    }                                                                         \
-                                                                              \
-    bool classname::AcceptsFocusRecursively() const                           \
-    {                                                                         \
-        return m_container.AcceptsFocusRecursively();                         \
-    }                                                                         \
-                                                                              \
-    void classname::SetFocus()                                                \
-    {                                                                         \
-        if ( !m_container.DoSetFocus() )                                      \
-            basename::SetFocus();                                             \
-    }                                                                         \
-                                                                              \
-    bool classname::AcceptsFocus() const                                      \
-    {                                                                         \
-        return m_container.AcceptsFocus();                                    \
-    }                                                                         \
-                                                                              \
-    bool classname::AcceptsFocusFromKeyboard() const                          \
-    {                                                                         \
-        return m_container.AcceptsFocusFromKeyboard();                        \
-    }
-
-
-#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
-
-#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname)
-
-#define WX_DECLARE_CONTROL_CONTAINER WX_DECLARE_CONTROL_CONTAINER_BASE
-
-#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename)                 \
-    WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename)                \
-                                                                              \
-    void classname::RemoveChild(wxWindowBase *child)                          \
-    {                                                                         \
-        basename::RemoveChild(child);                                         \
-                                                                              \
-        m_container.UpdateCanFocusChildren();                                 \
-    }                                                                         \
-                                                                              \
-    void classname::SetFocusIgnoringChildren()                                \
-    {                                                                         \
-        basename::SetFocus();                                                 \
-    }
-
-#else // !wxHAS_NATIVE_TAB_TRAVERSAL
-
-// declare the methods to be forwarded
-#define WX_DECLARE_CONTROL_CONTAINER()                                        \
-    WX_DECLARE_CONTROL_CONTAINER_BASE();                                      \
-                                                                              \
-public:                                                                       \
-    void OnNavigationKey(wxNavigationKeyEvent& event);                        \
-    void OnFocus(wxFocusEvent& event);                                        \
-    virtual void OnChildFocus(wxChildFocusEvent& event)
-
-// implement the event table entries for wxControlContainer
-#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \
-    EVT_SET_FOCUS(classname::OnFocus) \
-    EVT_CHILD_FOCUS(classname::OnChildFocus) \
-    EVT_NAVIGATION_KEY(classname::OnNavigationKey)
-
-// implement the methods forwarding to the wxControlContainer
-#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename)                 \
-    WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename)                \
-                                                                              \
-    void classname::RemoveChild(wxWindowBase *child)                          \
-    {                                                                         \
-        m_container.HandleOnWindowDestroy(child);                             \
-                                                                              \
-        basename::RemoveChild(child);                                         \
-                                                                              \
-        m_container.UpdateCanFocusChildren();                                 \
-    }                                                                         \
-                                                                              \
-    void classname::OnNavigationKey( wxNavigationKeyEvent& event )            \
-    {                                                                         \
-        m_container.HandleOnNavigationKey(event);                             \
-    }                                                                         \
-                                                                              \
-    void classname::SetFocusIgnoringChildren()                                \
-    {                                                                         \
-        basename::SetFocus();                                                 \
-    }                                                                         \
-                                                                              \
-    void classname::OnChildFocus(wxChildFocusEvent& event)                    \
-    {                                                                         \
-        m_container.SetLastFocus(event.GetWindow());                          \
-        event.Skip();                                                         \
-    }                                                                         \
-                                                                              \
-    void classname::OnFocus(wxFocusEvent& event)                              \
-    {                                                                         \
-        m_container.HandleOnFocus(event);                                     \
-    }
-
-#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #endif // _WX_CONTAINR_H_

include/wx/cursor.h

@@ -34,9 +34,6 @@ public:
              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 */
 
     virtual wxPoint GetHotSpot() const { return wxDefaultPosition; }

include/wx/dc.h

@@ -65,40 +65,6 @@ enum wxRasterOperationMode
     wxNAND,        // (NOT src) OR (NOT dst)
     wxOR,          // src OR dst
     wxSET          // 1
-#if WXWIN_COMPATIBILITY_2_8
-    ,wxROP_BLACK = wxCLEAR,
-    wxBLIT_BLACKNESS = wxCLEAR,
-    wxROP_XORPEN = wxXOR,
-    wxBLIT_SRCINVERT = wxXOR,
-    wxROP_NOT = wxINVERT,
-    wxBLIT_DSTINVERT = wxINVERT,
-    wxROP_MERGEPENNOT = wxOR_REVERSE,
-    wxBLIT_00DD0228 = wxOR_REVERSE,
-    wxROP_MASKPENNOT = wxAND_REVERSE,
-    wxBLIT_SRCERASE = wxAND_REVERSE,
-    wxROP_COPYPEN = wxCOPY,
-    wxBLIT_SRCCOPY = wxCOPY,
-    wxROP_MASKPEN = wxAND,
-    wxBLIT_SRCAND = wxAND,
-    wxROP_MASKNOTPEN = wxAND_INVERT,
-    wxBLIT_00220326 = wxAND_INVERT,
-    wxROP_NOP = wxNO_OP,
-    wxBLIT_00AA0029 = wxNO_OP,
-    wxROP_NOTMERGEPEN = wxNOR,
-    wxBLIT_NOTSRCERASE = wxNOR,
-    wxROP_NOTXORPEN = wxEQUIV,
-    wxBLIT_00990066 = wxEQUIV,
-    wxROP_NOTCOPYPEN = wxSRC_INVERT,
-    wxBLIT_NOTSCRCOPY = wxSRC_INVERT,
-    wxROP_MERGENOTPEN = wxOR_INVERT,
-    wxBLIT_MERGEPAINT = wxOR_INVERT,
-    wxROP_NOTMASKPEN = wxNAND,
-    wxBLIT_007700E6 = wxNAND,
-    wxROP_MERGEPEN = wxOR,
-    wxBLIT_SRCPAINT = wxOR,
-    wxROP_WHITE = wxSET,
-    wxBLIT_WHITENESS = wxSET
-#endif //WXWIN_COMPATIBILITY_2_8
 };
 
 //  Flood styles
@@ -139,70 +105,6 @@ struct wxFontMetrics
         averageWidth;       // Average font width, a.k.a. "x-width".
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-
-//-----------------------------------------------------------------------------
-// wxDrawObject helper class
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDrawObject
-{
-public:
-    wxDEPRECATED_CONSTRUCTOR(wxDrawObject)()
-        : m_isBBoxValid(false)
-        , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
-    { }
-
-    virtual ~wxDrawObject() { }
-
-    virtual void Draw(wxDC&) const { }
-
-    virtual void CalcBoundingBox(wxCoord x, wxCoord y)
-    {
-      if ( m_isBBoxValid )
-      {
-         if ( x < m_minX ) m_minX = x;
-         if ( y < m_minY ) m_minY = y;
-         if ( x > m_maxX ) m_maxX = x;
-         if ( y > m_maxY ) m_maxY = y;
-      }
-      else
-      {
-         m_isBBoxValid = true;
-
-         m_minX = x;
-         m_minY = y;
-         m_maxX = x;
-         m_maxY = y;
-      }
-    }
-
-    void ResetBoundingBox()
-    {
-        m_isBBoxValid = false;
-
-        m_minX = m_maxX = m_minY = m_maxY = 0;
-    }
-
-    // Get the final bounding box of the PostScript or Metafile picture.
-
-    wxCoord MinX() const { return m_minX; }
-    wxCoord MaxX() const { return m_maxX; }
-    wxCoord MinY() const { return m_minY; }
-    wxCoord MaxY() const { return m_maxY; }
-
-    //to define the type of object for derived objects
-    virtual int GetType()=0;
-
-protected:
-    //for boundingbox calculation
-    bool m_isBBoxValid:1;
-    //for boundingbox calculation
-    wxCoord m_minX, m_minY, m_maxX, m_maxY;
-};
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 
 //-----------------------------------------------------------------------------
 // wxDCFactory
@@ -1215,10 +1117,6 @@ public:
     void DrawLines(const wxPointList *list,
                    wxCoord xoffset = 0, wxCoord yoffset = 0)
         { m_pimpl->DrawLines( list, xoffset, yoffset ); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( void DrawLines(const wxList *list,
-                                 wxCoord xoffset = 0, wxCoord yoffset = 0) );
-#endif  // WXWIN_COMPATIBILITY_2_8
 
     void DrawPolygon(int n, const wxPoint points[],
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
@@ -1232,11 +1130,6 @@ public:
                          wxCoord xoffset = 0, wxCoord yoffset = 0,
                          wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
         { m_pimpl->DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( void DrawPolygon(const wxList *list,
-                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-                     wxPolygonFillMode fillStyle = wxODDEVEN_RULE) );
-#endif  // WXWIN_COMPATIBILITY_2_8
 
     void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         { m_pimpl->DoDrawRectangle(x, y, width, height); }
@@ -1358,20 +1251,6 @@ public:
 #endif // wxUSE_SPLINES
 
 
-#if WXWIN_COMPATIBILITY_2_8
-    // for compatibility with the old code when wxCoord was long everywhere
-    wxDEPRECATED( void GetTextExtent(const wxString& string,
-                       long *x, long *y,
-                       long *descent = NULL,
-                       long *externalLeading = NULL,
-                       const wxFont *theFont = NULL) const );
-    wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const );
-    wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
-    wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
-
-    wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) );
-#endif  // WXWIN_COMPATIBILITY_2_8
-
 #ifdef __WXMSW__
     // GetHDC() is the simplest way to retrieve an HDC From a wxDC but only
     // works if this wxDC is GDI-based and fails for GDI+ contexts (and

include/wx/defs.h

@@ -1410,15 +1410,6 @@ enum wxAlignment
 /* misc. flags for wxSizer items */
 enum wxSizerFlagBits
 {
-    /*
-        wxADJUST_MINSIZE doesn't do anything any more but we still define
-        it for compatibility. Notice that it may be also predefined (as 0,
-        hopefully) in the user code in order to use it even in
-        !WXWIN_COMPATIBILITY_2_8 builds so don't redefine it in such case.
-     */
-#if WXWIN_COMPATIBILITY_2_8 && !defined(wxADJUST_MINSIZE)
-    wxADJUST_MINSIZE               = 0,
-#endif
     wxFIXED_MINSIZE                = 0x8000,
     wxRESERVE_SPACE_EVEN_IF_HIDDEN = 0x0002,
 

include/wx/dfb/cursor.h

@@ -22,9 +22,6 @@ class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
 public:
     wxCursor() {}
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 #if wxUSE_IMAGE
     wxCursor(const wxImage& image);
     wxCursor(const char* const* xpmData);

include/wx/docview.h

@@ -173,13 +173,6 @@ public:
     // "unnamed" otherwise
     virtual wxString GetUserReadableName() const;
 
-#if WXWIN_COMPATIBILITY_2_8
-    // use GetUserReadableName() instead
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual bool GetPrintableName(wxString& buf) const
-    );
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // Returns a window that can be used as a parent for document-related
     // dialogs. Override if necessary.
     virtual wxWindow *GetDocumentWindow() const;
@@ -522,13 +515,6 @@ public:
         { return m_pageSetupDialogData; }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-#if WXWIN_COMPATIBILITY_2_8
-    // deprecated, override GetDefaultName() instead
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual bool MakeDefaultName(wxString& buf)
-    );
-#endif
-
 protected:
     // Called when a file selected from the MRU list doesn't exist any more.
     // The default behaviour is to remove the file from the MRU and notify the
@@ -987,18 +973,6 @@ bool WXDLLIMPEXP_CORE
 wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
 #endif // wxUSE_STD_IOSTREAM
 
-
-// these flags are not used anywhere by wxWidgets and kept only for an unlikely
-// case of existing user code using them for its own purposes
-#if WXWIN_COMPATIBILITY_2_8
-enum
-{
-    wxDOC_SDI = 1,
-    wxDOC_MDI,
-    wxDEFAULT_DOCMAN_FLAGS = wxDOC_SDI
-};
-#endif // WXWIN_COMPATIBILITY_2_8
-
 inline wxViewVector wxDocument::GetViewsVector() const
 {
     return m_documentViews.AsVector<wxView*>();

include/wx/effects.h

@@ -1,90 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/effects.h
-// Purpose:     wxEffects class
-//              Draws 3D effects.
-// Author:      Julian Smart et al
-// Modified by:
-// Created:     25/4/2000
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_EFFECTS_H_
-#define _WX_EFFECTS_H_
-
-// this class is deprecated and will be removed in the next wx version
-//
-// please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no
-// replacement for TileBitmap() but it doesn't seem to be very useful anyhow
-#if WXWIN_COMPATIBILITY_2_8
-
-/*
- * wxEffects: various 3D effects
- */
-
-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/gdicmn.h"
-#include "wx/dc.h"
-
-class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject
-{
-public:
-    // Assume system colours
-    wxEffectsImpl() ;
-    // Going from lightest to darkest
-    wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow,
-                  const wxColour& faceColour, const wxColour& mediumShadow,
-                  const wxColour& darkShadow) ;
-
-    // Accessors
-    wxColour GetHighlightColour() const { return m_highlightColour; }
-    wxColour GetLightShadow() const { return m_lightShadow; }
-    wxColour GetFaceColour() const { return m_faceColour; }
-    wxColour GetMediumShadow() const { return m_mediumShadow; }
-    wxColour GetDarkShadow() const { return m_darkShadow; }
-
-    void SetHighlightColour(const wxColour& c) { m_highlightColour = c; }
-    void SetLightShadow(const wxColour& c) { m_lightShadow = c; }
-    void SetFaceColour(const wxColour& c) { m_faceColour = c; }
-    void SetMediumShadow(const wxColour& c) { m_mediumShadow = c; }
-    void SetDarkShadow(const wxColour& c) { m_darkShadow = c; }
-
-    void Set(const wxColour& highlightColour, const wxColour& lightShadow,
-             const wxColour& faceColour, const wxColour& mediumShadow,
-             const wxColour& darkShadow)
-    {
-        SetHighlightColour(highlightColour);
-        SetLightShadow(lightShadow);
-        SetFaceColour(faceColour);
-        SetMediumShadow(mediumShadow);
-        SetDarkShadow(darkShadow);
-    }
-
-    // Draw a sunken edge
-    void DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize = 1);
-
-    // Tile a bitmap
-    bool TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap);
-
-protected:
-    wxColour    m_highlightColour;  // Usually white
-    wxColour    m_lightShadow;      // Usually light grey
-    wxColour    m_faceColour;       // Usually grey
-    wxColour    m_mediumShadow;     // Usually dark grey
-    wxColour    m_darkShadow;       // Usually black
-
-    wxDECLARE_CLASS(wxEffectsImpl);
-};
-
-// current versions of g++ don't generate deprecation warnings for classes
-// declared deprecated, so define wxEffects as a typedef instead: this does
-// generate warnings with both g++ and VC (which also has no troubles with
-// directly deprecating the classes...)
-//
-// note that this g++ bug (16370) is supposed to be fixed in g++ 4.3.0
-wxDEPRECATED(typedef wxEffectsImpl wxEffects);
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-#endif // _WX_EFFECTS_H_

include/wx/event.h

@@ -2696,10 +2696,6 @@ public:
     // return true if the window was shown, false if hidden
     bool IsShown() const { return m_show; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( bool GetShow() const { return IsShown(); } )
-#endif
-
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxShowEvent(*this); }
 
 protected:
@@ -2723,9 +2719,6 @@ public:
         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( bool Iconized() const { return IsIconized(); } )
-#endif
     // return true if the frame was iconized, false if restored
     bool IsIconized() const { return m_iconized; }
 
@@ -4013,15 +4006,6 @@ protected:
     // base class implementation passes the event to wxTheApp
     virtual bool TryAfter(wxEvent& event);
 
-#if WXWIN_COMPATIBILITY_2_8
-    // deprecated method: override TryBefore() instead of this one
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; )
-
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual bool TryParent(wxEvent& event), return DoTryApp(event); )
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // Overriding this method allows filtering the event handlers dynamically
     // connected to this object. If this method returns false, the handler is
     // not connected at all. If it returns true, it is connected using the

include/wx/filefn.h

@@ -453,53 +453,6 @@ WXDLLIMPEXP_BASE wxString wxFileNameFromPath(const wxString& path);
 // Get directory
 WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path);
 
-// all deprecated functions below are deprecated in favour of wxFileName's methods
-#if WXWIN_COMPATIBILITY_2_8
-
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(char *s) );
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(wchar_t *s) );
-
-wxDEPRECATED_BUT_USED_INTERNALLY(
-    WXDLLIMPEXP_BASE void wxUnix2DosFilename(char *s) );
-wxDEPRECATED_BUT_USED_INTERNALLY(
-    WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s) );
-
-// Strip the extension, in situ
-// Deprecated in favour of wxFileName::StripExtension() but notice that their
-// behaviour is slightly different, see the manual
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(char *buffer) );
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wchar_t *buffer) );
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer) );
-
-// Get a temporary filename
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = NULL) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf) );
-
-// Expand file name (~/ and ${OPENWINHOME}/ stuff)
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE char* wxExpandPath(char *dest, const wxString& path) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wchar_t* wxExpandPath(wchar_t *dest, const wxString& path) );
-    // DEPRECATED: use wxFileName::Normalize(wxPATH_NORM_ENV_VARS)
-
-// Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
-// and make (if under the home tree) relative to home
-// [caller must copy-- volatile]
-wxDEPRECATED(
-WXDLLIMPEXP_BASE wxChar* wxContractPath(const wxString& filename,
-                                   const wxString& envname = wxEmptyString,
-                                   const wxString& user = wxEmptyString) );
-    // DEPRECATED: use wxFileName::ReplaceEnvVariable and wxFileName::ReplaceHomeDir
-
-// Destructive removal of /./ and /../ stuff
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE char* wxRealPath(char *path) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wchar_t* wxRealPath(wchar_t *path) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path) );
-    // DEPRECATED: use wxFileName::Normalize instead
-
-// Allocate a copy of the full absolute path
-wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path) );
-    // DEPRECATED: use wxFileName::MakeAbsolute instead
-#endif
-
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 #define wxFILE  1
@@ -608,16 +561,6 @@ inline bool wxIsPathSeparator(wxChar c)
 // does the string ends with path separator?
 WXDLLIMPEXP_BASE bool wxEndsWithPathSeparator(const wxString& filename);
 
-#if WXWIN_COMPATIBILITY_2_8
-// split the full path into path (including drive for DOS), name and extension
-// (understands both '/' and '\\')
-// Deprecated in favour of wxFileName::SplitPath
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxSplitPath(const wxString& fileName,
-                                                wxString *pstrPath,
-                                                wxString *pstrName,
-                                                wxString *pstrExt) );
-#endif
-
 // find a file in a list of directories, returns false if not found
 WXDLLIMPEXP_BASE bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile);
 

include/wx/flags.h

@@ -169,8 +169,4 @@ private :
 
 #endif
 
-#if WXWIN_COMPATIBILITY_2_8
-    #define WX_DEFINE_FLAGS     wxDEFINE_FLAGS
-#endif
-
 #endif

include/wx/font.h

@@ -476,12 +476,6 @@ public:
     // account as well.
     static int GetNumericWeightOf(wxFontWeight weight);
 
-    // this doesn't do anything and is kept for compatibility only
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no);)
-    wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
-#endif // WXWIN_COMPATIBILITY_2_8
-
     wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants instead of raw values")
     void SetWeight(int weight)
         { SetWeight(static_cast<wxFontWeight>(weight)); }

include/wx/generic/choicdgg.h

@@ -139,74 +139,6 @@ public:
     wxString GetStringSelection() const { return m_stringSelection; }
     void* GetSelectionData() const { return m_clientData; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // Deprecated overloads taking "char**" client data.
-    wxDEPRECATED_CONSTRUCTOR
-    (
-        wxSingleChoiceDialog(wxWindow *parent,
-                             const wxString& message,
-                             const wxString& caption,
-                             int n,
-                             const wxString *choices,
-                             char **clientData,
-                             long style = wxCHOICEDLG_STYLE,
-                             const wxPoint& pos = wxDefaultPosition)
-    )
-    {
-        Create(parent, message, caption, n, choices,
-               (void**)clientData, style, pos);
-    }
-
-    wxDEPRECATED_CONSTRUCTOR
-    (
-        wxSingleChoiceDialog(wxWindow *parent,
-                             const wxString& message,
-                             const wxString& caption,
-                             const wxArrayString& choices,
-                             char **clientData,
-                             long style = wxCHOICEDLG_STYLE,
-                             const wxPoint& pos = wxDefaultPosition)
-    )
-    {
-        Create(parent, message, caption, choices,
-               (void**)clientData, style, pos);
-    }
-
-    wxDEPRECATED_INLINE
-    (
-        bool Create(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption,
-                    int n,
-                    const wxString *choices,
-                    char **clientData,
-                    long style = wxCHOICEDLG_STYLE,
-                    const wxPoint& pos = wxDefaultPosition),
-        return Create(parent, message, caption, n, choices,
-                      (void**)clientData, style, pos);
-    )
-
-    wxDEPRECATED_INLINE
-    (
-        bool Create(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption,
-                    const wxArrayString& choices,
-                    char **clientData,
-                    long style = wxCHOICEDLG_STYLE,
-                    const wxPoint& pos = wxDefaultPosition),
-        return Create(parent, message, caption, choices,
-                      (void**)clientData, style, pos);
-    )
-
-    // NB: no need to make it return wxChar, it's untyped
-    wxDEPRECATED_ACCESSOR
-    (
-        char* GetSelectionClientData() const,
-        (char*)GetSelectionData()
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // implementation from now on
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);
@@ -424,31 +356,4 @@ WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
 
-#if WXWIN_COMPATIBILITY_2_8
-// fill the array with the indices of the chosen items, it will be empty
-// if no items were selected or Cancel was pressed - return the number of
-// selections
-wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections,
-                                        const wxString& message,
-                                        const wxString& caption,
-                                        int n, const wxString *choices,
-                                        wxWindow *parent = NULL,
-                                        int x = wxDefaultCoord,
-                                        int y = wxDefaultCoord,
-                                        bool centre = true,
-                                        int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT) );
-
-wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections,
-                                        const wxString& message,
-                                        const wxString& caption,
-                                        const wxArrayString& choices,
-                                        wxWindow *parent = NULL,
-                                        int x = wxDefaultCoord,
-                                        int y = wxDefaultCoord,
-                                        bool centre = true,
-                                        int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT));
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #endif // _WX_GENERIC_CHOICDGG_H_

include/wx/generic/grid.h

@@ -2390,172 +2390,6 @@ public:
     // unset any existing sorting column
     void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // ------ For compatibility with previous wxGrid only...
-    //
-    //  ************************************************
-    //  **  Don't use these in new code because they  **
-    //  **  are liable to disappear in a future       **
-    //  **  revision                                  **
-    //  ************************************************
-    //
-
-    wxGrid( wxWindow *parent,
-            int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord,
-            long style = wxWANTS_CHARS,
-            const wxString& name = wxASCII_STR(wxPanelNameStr) )
-    {
-        Init();
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(w, h), style, name);
-    }
-
-    void SetCellValue( const wxString& val, int row, int col )
-        { SetCellValue( row, col, val ); }
-
-    void UpdateDimensions()
-        { CalcDimensions(); }
-
-    int GetRows() const { return GetNumberRows(); }
-    int GetCols() const { return GetNumberCols(); }
-    int GetCursorRow() const { return GetGridCursorRow(); }
-    int GetCursorColumn() const { return GetGridCursorCol(); }
-
-    int GetScrollPosX() const { return 0; }
-    int GetScrollPosY() const { return 0; }
-
-    void SetScrollX( int WXUNUSED(x) ) { }
-    void SetScrollY( int WXUNUSED(y) ) { }
-
-    void SetColumnWidth( int col, int width )
-        { SetColSize( col, width ); }
-
-    int GetColumnWidth( int col ) const
-        { return GetColSize( col ); }
-
-    void SetRowHeight( int row, int height )
-        { SetRowSize( row, height ); }
-
-    // GetRowHeight() is below
-
-    int GetViewHeight() const // returned num whole rows visible
-        { return 0; }
-
-    int GetViewWidth() const // returned num whole cols visible
-        { return 0; }
-
-    void SetLabelSize( int orientation, int sz )
-        {
-            if ( orientation == wxHORIZONTAL )
-                SetColLabelSize( sz );
-            else
-                SetRowLabelSize( sz );
-        }
-
-    int GetLabelSize( int orientation ) const
-        {
-            if ( orientation == wxHORIZONTAL )
-                return GetColLabelSize();
-            else
-                return GetRowLabelSize();
-        }
-
-    void SetLabelAlignment( int orientation, int align )
-        {
-            if ( orientation == wxHORIZONTAL )
-                SetColLabelAlignment( align, wxALIGN_INVALID );
-            else
-                SetRowLabelAlignment( align, wxALIGN_INVALID );
-        }
-
-    int GetLabelAlignment( int orientation, int WXUNUSED(align) ) const
-        {
-            int h, v;
-            if ( orientation == wxHORIZONTAL )
-            {
-                GetColLabelAlignment( &h, &v );
-                return h;
-            }
-            else
-            {
-                GetRowLabelAlignment( &h, &v );
-                return h;
-            }
-        }
-
-    void SetLabelValue( int orientation, const wxString& val, int pos )
-        {
-            if ( orientation == wxHORIZONTAL )
-                SetColLabelValue( pos, val );
-            else
-                SetRowLabelValue( pos, val );
-        }
-
-    wxString GetLabelValue( int orientation, int pos) const
-        {
-            if ( orientation == wxHORIZONTAL )
-                return GetColLabelValue( pos );
-            else
-                return GetRowLabelValue( pos );
-        }
-
-    wxFont GetCellTextFont() const
-        { return m_defaultCellAttr->GetFont(); }
-
-    wxFont GetCellTextFont(int WXUNUSED(row), int WXUNUSED(col)) const
-        { return m_defaultCellAttr->GetFont(); }
-
-    void SetCellTextFont(const wxFont& fnt)
-        { SetDefaultCellFont( fnt ); }
-
-    void SetCellTextFont(const wxFont& fnt, int row, int col)
-        { SetCellFont( row, col, fnt ); }
-
-    void SetCellTextColour(const wxColour& val, int row, int col)
-        { SetCellTextColour( row, col, val ); }
-
-    void SetCellTextColour(const wxColour& col)
-        { SetDefaultCellTextColour( col ); }
-
-    void SetCellBackgroundColour(const wxColour& col)
-        { SetDefaultCellBackgroundColour( col ); }
-
-    void SetCellBackgroundColour(const wxColour& colour, int row, int col)
-        { SetCellBackgroundColour( row, col, colour ); }
-
-    bool GetEditable() const { return IsEditable(); }
-    void SetEditable( bool edit = true ) { EnableEditing( edit ); }
-    bool GetEditInPlace() const { return IsCellEditControlEnabled(); }
-
-    void SetEditInPlace(bool WXUNUSED(edit) = true) { }
-
-    void SetCellAlignment( int align, int row, int col)
-    { SetCellAlignment(row, col, align, wxALIGN_CENTER); }
-    void SetCellAlignment( int WXUNUSED(align) ) {}
-    void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col))
-    { }
-    void SetDividerPen(const wxPen& WXUNUSED(pen)) { }
-    wxPen& GetDividerPen() const;
-    void OnActivate(bool WXUNUSED(active)) {}
-
-    // ******** End of compatibility functions **********
-
-
-
-    // ------ control IDs
-    enum { wxGRID_CELLCTRL = 2000,
-           wxGRID_TOPCTRL };
-
-    // ------ control types
-    enum { wxGRID_TEXTCTRL = 2100,
-           wxGRID_CHECKBOX,
-           wxGRID_CHOICE,
-           wxGRID_COMBOBOX };
-
-    wxDEPRECATED_INLINE(bool CanDragRowSize() const, return m_canDragRowSize; )
-    wxDEPRECATED_INLINE(bool CanDragColSize() const, return m_canDragColSize; )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
     // override some base class functions
     virtual void Fit() wxOVERRIDE;
     virtual void SetFocus() wxOVERRIDE;

include/wx/generic/helpext.h

@@ -31,10 +31,6 @@ public:
     wxExtHelpController(wxWindow* parentWindow = NULL);
     virtual ~wxExtHelpController();
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(void SetBrowser(const wxString& browsername = wxEmptyString, bool isNetscape = false) );
-#endif
-
     // Set viewer: new name for SetBrowser
     virtual void SetViewer(const wxString& viewer = wxEmptyString,
                             long flags = wxHELP_NETSCAPE) wxOVERRIDE;

include/wx/generic/panelg.h

@@ -29,18 +29,6 @@ public:
         Create(parent, winid, pos, size, style, name);
     }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxASCII_STR(wxPanelNameStr))
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };

include/wx/generic/textdlgg.h

@@ -68,9 +68,6 @@ public:
 
 #if wxUSE_VALIDATORS
     void SetTextValidator( const wxTextValidator& validator );
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( void SetTextValidator( long style ) );
-#endif
     void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE );
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif // wxUSE_VALIDATORS

include/wx/glcanvas.h

@@ -258,15 +258,6 @@ public:
     // as a parameter
     wxGLContextAttrs& GetGLCTXAttrs() { return m_GLCTXAttrs; }
 
-    // deprecated methods using the implicit wxGLContext
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( wxGLContext* GetContext() const );
-
-    wxDEPRECATED( void SetCurrent() );
-
-    wxDEPRECATED( void OnSize(wxSizeEvent& event) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #ifdef __WXUNIVERSAL__
     // resolve the conflict with wxWindowUniv::SetCurrent()
     virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }
@@ -298,10 +289,6 @@ protected:
 
     wxPalette m_palette;
 #endif // wxUSE_PALETTE
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxGLContext *m_glContext;
-#endif // WXWIN_COMPATIBILITY_2_8
 };
 
 // ----------------------------------------------------------------------------

include/wx/gtk/cursor.h

@@ -20,9 +20,6 @@ class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
 public:
     wxCursor();
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
     wxCursor(const char* const* xpmData);

include/wx/gtk/glcanvas.h

@@ -74,60 +74,12 @@ public:
     virtual unsigned long GetXWindow() const wxOVERRIDE;
     void* GetNativeWindow() const;
 
-    // deprecated methods
-    // ------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLContext *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLCanvas *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    // called from "realized" callback to create the implicit context if needed
-    void GTKInitImplicitContext();
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // implementation from now on
     virtual void GTKHandleRealized() wxOVERRIDE;
 
 #ifdef __WXGTK3__
     wxSize m_size;
 #endif
-#if WXWIN_COMPATIBILITY_2_8
-    wxGLContext      *m_sharedContext;
-    wxGLCanvas       *m_sharedContextOf;
-    const bool        m_createImplicitContext;
-#endif // WXWIN_COMPATIBILITY_2_8
 
 private:
     wxDECLARE_CLASS(wxGLCanvas);

include/wx/gtk/menuitem.h

@@ -45,18 +45,6 @@ public:
     void GTKSetExtraAccels();
 #endif // wxUSE_ACCEL
 
-#if WXWIN_COMPATIBILITY_2_8
-    // compatibility only, don't use in new code
-    wxDEPRECATED_CONSTRUCTOR(
-    wxMenuItem(wxMenu *parentMenu,
-               int id,
-               const wxString& text,
-               const wxString& help,
-               bool isCheckable,
-               wxMenu *subMenu = NULL)
-    );
-#endif
-
 private:
     GtkWidget *m_menuItem;  // GtkMenuItem
 

include/wx/gtk1/cursor.h

@@ -24,9 +24,6 @@ class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
 public:
     wxCursor();
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
     wxCursor(const char* const* xpmData);

include/wx/gtk1/glcanvas.h

@@ -63,62 +63,12 @@ public:
 
     virtual unsigned long GetXWindow() const;
 
-
-    // deprecated methods
-    // ------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED_CONSTRUCTOR(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLContext *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED_CONSTRUCTOR(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLCanvas *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    // called from "realized" callback to create the implicit context if needed
-    void GTKInitImplicitContext();
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // implementation from now on
     virtual void OnInternalIdle();
 
 
     GtkWidget        *m_glWidget;
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxGLContext      *m_sharedContext;
-    wxGLCanvas       *m_sharedContextOf;
-    const bool        m_createImplicitContext;
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
     wxDECLARE_CLASS(wxGLCanvas);
 };

include/wx/hashmap.h

@@ -573,15 +573,6 @@ struct WXDLLIMPEXP_BASE wxStringHash
     unsigned long operator()( const char* x ) const wxNOEXCEPT
         { return stringHash( x ); }
 
-#if WXWIN_COMPATIBILITY_2_8
-    static unsigned long wxCharStringHash( const wxChar* x )
-        { return stringHash(x); }
-    #if wxUSE_UNICODE
-    static unsigned long charStringHash( const char* x )
-        { return stringHash(x); }
-    #endif
-#endif // WXWIN_COMPATIBILITY_2_8
-
     static unsigned long stringHash( const wchar_t* );
     static unsigned long stringHash( const char* );
 };

include/wx/html/htmltag.h

@@ -138,21 +138,11 @@ public:
     // bla bla bla <MYTAG> bla bla internal text</MYTAG>* bla bla
     wxString::const_iterator GetEndIter2() const { return m_End2; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // use GetBeginIter(), GetEndIter1() and GetEndIter2() instead
-    wxDEPRECATED( inline int GetBeginPos() const );
-    wxDEPRECATED( inline int GetEndPos1() const );
-    wxDEPRECATED( inline int GetEndPos2() const );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
     wxString m_Name;
     bool m_hasEnding;
     wxString::const_iterator m_Begin, m_End1, m_End2;
     wxArrayString m_ParamNames, m_ParamValues;
-#if WXWIN_COMPATIBILITY_2_8
-    wxString::const_iterator m_sourceStart;
-#endif
 
     // DOM tree relations:
     wxHtmlTag *m_Next;
@@ -163,16 +153,6 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxHtmlTag);
 };
 
-
-#if WXWIN_COMPATIBILITY_2_8
-inline int wxHtmlTag::GetBeginPos() const { return int(m_Begin - m_sourceStart); }
-inline int wxHtmlTag::GetEndPos1() const { return int(m_End1 - m_sourceStart); }
-inline int wxHtmlTag::GetEndPos2() const { return int(m_End2 - m_sourceStart); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
-
-
 #endif // wxUSE_HTML
 
 #endif // _WX_HTMLTAG_H_

include/wx/iconbndl.h

@@ -110,22 +110,6 @@ public:
     // check if we have any icons at all
     bool IsEmpty() const { return GetIconCount() == 0; }
 
-#if WXWIN_COMPATIBILITY_2_8
-#if wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)
-    wxDEPRECATED( void AddIcon(const wxString& file, long type)
-        {
-            AddIcon(file, (wxBitmapType)type);
-        }
-    )
-
-    wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)
-        {
-            AddIcon(file, (wxBitmapType)type);
-        }
-    )
-#endif // wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;

include/wx/image.h

@@ -146,12 +146,6 @@ public:
     wxBitmapType GetType() const { return m_type; }
     const wxString& GetMimeType() const { return m_mime; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-        void SetType(long type) { SetType((wxBitmapType)type); }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
 #if wxUSE_STREAMS
     // NOTE: this function is allowed to change the current stream position
@@ -600,66 +594,6 @@ public:
     static HSVValue RGBtoHSV(const RGBValue& rgb);
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-        wxImage(const wxString& name, long type, int index = -1)
-        {
-            LoadFile(name, (wxBitmapType)type, index);
-        }
-    )
-
-#if wxUSE_STREAMS
-    wxDEPRECATED_CONSTRUCTOR(
-        wxImage(wxInputStream& stream, long type, int index = -1)
-        {
-            LoadFile(stream, (wxBitmapType)type, index);
-        }
-    )
-
-    wxDEPRECATED(
-        bool LoadFile(wxInputStream& stream, long type, int index = -1)
-        {
-            return LoadFile(stream, (wxBitmapType)type, index);
-        }
-    )
-
-    wxDEPRECATED(
-        bool SaveFile(wxOutputStream& stream, long type) const
-        {
-            return SaveFile(stream, (wxBitmapType)type);
-        }
-    )
-#endif // wxUSE_STREAMS
-
-    wxDEPRECATED(
-        bool LoadFile(const wxString& name, long type, int index = -1)
-        {
-            return LoadFile(name, (wxBitmapType)type, index);
-        }
-    )
-
-    wxDEPRECATED(
-        bool SaveFile(const wxString& name, long type) const
-        {
-            return SaveFile(name, (wxBitmapType)type);
-        }
-    )
-
-    wxDEPRECATED(static
-        wxImageHandler *FindHandler(const wxString& ext, long type)
-        {
-            return FindHandler(ext, (wxBitmapType)type);
-        }
-    )
-
-    wxDEPRECATED(static
-        wxImageHandler *FindHandler(long imageType)
-        {
-            return FindHandler((wxBitmapType)imageType);
-        }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     static wxList   sm_handlers;
 

include/wx/intl.h

@@ -49,10 +49,6 @@ enum wxLocaleInitFlags
 {
     wxLOCALE_DONT_LOAD_DEFAULT = 0x0000,     // don't load wxwin.mo
     wxLOCALE_LOAD_DEFAULT      = 0x0001      // load wxwin.mo?
-#if WXWIN_COMPATIBILITY_2_8
-   ,wxLOCALE_CONV_ENCODING     = 0x0002      // no longer used, simply remove
-                                             // it from the existing code
-#endif
 };
 
 // NOTE: This class is deprecated, use wxUILocale and wxTranslations instead.
@@ -71,18 +67,11 @@ public:
              const wxString& shortName = wxEmptyString,      // dir prefix (for msg files)
              const wxString& locale = wxEmptyString,     // locale (for setlocale)
              bool bLoadDefault = true                            // preload wxstd.mo?
-#if WXWIN_COMPATIBILITY_2_8
-             ,bool bConvertEncoding = true                      // convert Win<->Unix if necessary?
-#endif
              )
         {
             DoCommonInit();
 
-#if WXWIN_COMPATIBILITY_2_8
-            Init(name, shortName, locale, bLoadDefault, bConvertEncoding);
-#else
             Init(name, shortName, locale, bLoadDefault);
-#endif
         }
 
     wxLocale(int language, // wxLanguage id or custom language
@@ -98,9 +87,6 @@ public:
               const wxString& shortName = wxEmptyString,
               const wxString& locale = wxEmptyString,
               bool bLoadDefault = true
-#if WXWIN_COMPATIBILITY_2_8
-              ,bool bConvertEncoding = true
-#endif
               );
 
         // same as second ctor (returns true on success)

include/wx/log.h

@@ -21,21 +21,6 @@
 // NB: this is needed even if wxUSE_LOG == 0
 typedef unsigned long wxLogLevel;
 
-// the trace masks have been superseded by symbolic trace constants, they're
-// for compatibility only and will be removed soon - do NOT use them
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxTraceMemAlloc 0x0001  // trace memory allocation (new/delete)
-    #define wxTraceMessages 0x0002  // trace window messages/X callbacks
-    #define wxTraceResAlloc 0x0004  // trace GDI resource allocation
-    #define wxTraceRefCount 0x0008  // trace various ref counting operations
-
-    #ifdef  __WINDOWS__
-        #define wxTraceOleCalls 0x0100  // OLE interface calls
-    #endif
-
-    typedef unsigned long wxTraceMask;
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -576,16 +561,6 @@ public:
     // this method exists for backwards compatibility only, don't use
     bool HasPendingMessages() const { return true; }
 
-    // don't use integer masks any more, use string trace masks instead
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE( static void SetTraceMask(wxTraceMask ulMask),
-        ms_ulTraceMask = ulMask; )
-
-    // this one can't be marked deprecated as it's used in our own wxLogger
-    // below but it still is deprecated and shouldn't be used
-    static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     // the logging functions that can be overridden: DoLogRecord() is called
     // for every "record", i.e. a unit of log output, to be logged and by
@@ -609,35 +584,6 @@ protected:
     // this one as the default implementation of it simply asserts
     virtual void DoLogText(const wxString& msg);
 
-
-    // the rest of the functions are for backwards compatibility only, don't
-    // use them in new code; if you're updating your existing code you need to
-    // switch to overriding DoLogRecord/Text() above (although as long as these
-    // functions exist, log classes using them will continue to work)
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void DoLog(wxLogLevel level, const char *szString, time_t t)
-    );
-
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void DoLog(wxLogLevel level, const wchar_t *wzString, time_t t)
-    );
-
-    // these shouldn't be used by new code
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual void DoLogString(const char *WXUNUSED(szString),
-                                 time_t WXUNUSED(t)),
-        wxEMPTY_PARAMETER_VALUE
-    )
-
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual void DoLogString(const wchar_t *WXUNUSED(wzString),
-                                 time_t WXUNUSED(t)),
-        wxEMPTY_PARAMETER_VALUE
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
     // log a message indicating the number of times the previous message was
     // repeated if previous repetition counter is strictly positive, does
     // nothing otherwise; return the old value of repetition counter
@@ -696,10 +642,6 @@ private:
     // disabled
     static wxString    ms_timestamp;
 
-#if WXWIN_COMPATIBILITY_2_8
-    static wxTraceMask ms_ulTraceMask;   // controls wxLogTrace behaviour
-#endif // WXWIN_COMPATIBILITY_2_8
-
     wxDECLARE_NO_COPY_CLASS(wxLog);
 };
 
@@ -1027,15 +969,6 @@ public:
         DoLogTrace, DoLogTraceUtf8
     )
 
-#if WXWIN_COMPATIBILITY_2_8
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        LogTrace,
-        2, (wxTraceMask, const wxFormatString&),
-        DoLogTraceMask, DoLogTraceMaskUtf8
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
 #if !wxUSE_UTF8_LOCALE_ONLY
     void DoLog(const wxChar *format, ...)
@@ -1089,21 +1022,6 @@ private:
         DoCallOnLog(format, argptr);
         va_end(argptr);
     }
-
-#if WXWIN_COMPATIBILITY_2_8
-    void DoLogTraceMask(wxTraceMask mask, const wxChar *format, ...)
-    {
-        if ( (wxLog::GetTraceMask() & mask) != mask )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-#endif // WXWIN_COMPATIBILITY_2_8
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
 #if wxUSE_UNICODE_UTF8
@@ -1158,21 +1076,6 @@ private:
         DoCallOnLog(format, argptr);
         va_end(argptr);
     }
-
-#if WXWIN_COMPATIBILITY_2_8
-    void DoLogTraceMaskUtf8(wxTraceMask mask, const char *format, ...)
-    {
-        if ( (wxLog::GetTraceMask() & mask) != mask )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-#endif // WXWIN_COMPATIBILITY_2_8
 #endif // wxUSE_UNICODE_UTF8
 
     void DoCallOnLog(wxLogLevel level, const wxString& format, va_list argptr)
@@ -1450,9 +1353,6 @@ inline void wxLogNop() { }
     #ifdef HAVE_VARIADIC_MACROS
         #define wxLogTrace(mask, fmt, ...) wxLogNop()
     #else // !HAVE_VARIADIC_MACROS
-        #if WXWIN_COMPATIBILITY_2_8
-        WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (wxTraceMask, const wxFormatString&))
-        #endif
         WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxFormatString&))
     #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS
 #endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE

include/wx/math.h

@@ -211,12 +211,6 @@ WXDLLIMPEXP_BASE unsigned int wxCTZ(wxUint32 x);
     WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
     WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
 
-    /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
-    wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
-#endif
-
 #ifdef __cplusplus
     }
 #endif

include/wx/menu.h

@@ -566,14 +566,6 @@ public:
     const wxMenuInfoHelperList& GetMenuInfos() const;
 #endif
 
-#if WXWIN_COMPATIBILITY_2_8
-    // get or change the label of the menu at given position
-    // Deprecated in favour of SetMenuLabel
-    wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );
-    // Deprecated in favour of GetMenuLabelText
-    wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
-#endif
-
 protected:
     // the list of all our menus
     wxMenuList m_menus;

include/wx/menuitem.h

@@ -145,24 +145,6 @@ public:
     virtual void ClearExtraAccels();
 #endif // wxUSE_ACCEL
 
-#if WXWIN_COMPATIBILITY_2_8
-    // compatibility only, use new functions in the new code
-    wxDEPRECATED( void SetName(const wxString& str) );
-    wxDEPRECATED( wxString GetName() const );
-
-    // Now use GetItemLabelText
-    wxDEPRECATED( wxString GetLabel() const ) ;
-
-    // Now use GetItemLabel
-    wxDEPRECATED( const wxString& GetText() const );
-
-    // Now use GetLabelText to strip the accelerators
-    wxDEPRECATED( static wxString GetLabelFromText(const wxString& text) );
-
-    // Now use SetItemLabel
-    wxDEPRECATED( virtual void SetText(const wxString& str) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
     static wxMenuItem *New(wxMenu *parentMenu,
                            int itemid,
                            const wxString& text,
@@ -208,17 +190,6 @@ private:
     wxMenuItemBase& operator=(const wxMenuItemBase& item);
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-inline void wxMenuItemBase::SetName(const wxString &str)
-    { SetItemLabel(str); }
-inline wxString wxMenuItemBase::GetName() const
-    { return GetItemLabel(); }
-inline wxString wxMenuItemBase::GetLabel() const
-    { return GetLabelText(m_text); }
-inline const wxString& wxMenuItemBase::GetText() const { return m_text; }
-inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // include the real class declaration
 // ----------------------------------------------------------------------------

include/wx/motif/cursor.h

@@ -36,9 +36,6 @@ public:
 #endif
 
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 
     virtual ~wxCursor();
 

include/wx/mousestate.h

@@ -121,16 +121,6 @@ public:
     // this mostly makes sense in the derived classes such as wxMouseEvent
     void SetState(const wxMouseState& state) { *this = state; }
 
-    // these functions are for compatibility only, they were used in 2.8
-    // version of wxMouseState but their names are confusing as wxMouseEvent
-    // has methods with the same names which do something quite different so
-    // don't use them any more
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); )
-    wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
-    wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // for compatibility reasons these variables are public as the code using
     // wxMouseEvent often uses them directly -- however they should not be
     // accessed directly in this class, use the accessors above instead

include/wx/msw/cursor.h

@@ -27,9 +27,6 @@ public:
              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 
     virtual wxPoint GetHotSpot() const wxOVERRIDE;
 

include/wx/msw/dragimag.h

@@ -208,16 +208,6 @@ public:
     WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; }
 #endif
 
-    // don't use in new code, use versions without hot spot parameter
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     WXHIMAGELIST    m_hImageList;
 

include/wx/msw/glcanvas.h

@@ -114,45 +114,6 @@ public:
     void OnPaletteChanged(wxPaletteChangedEvent& event);
 #endif // wxUSE_PALETTE
 
-    // deprecated methods using the implicit wxGLContext, associate the context
-    // explicitly with the window instead
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLContext *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLCanvas *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     // common part of all ctors
     void Init();

include/wx/msw/menuitem.h

@@ -59,18 +59,6 @@ public:
     // Win32 API
     WXWPARAM GetMSWId() const;
 
-#if WXWIN_COMPATIBILITY_2_8
-    // compatibility only, don't use in new code
-    wxDEPRECATED(
-    wxMenuItem(wxMenu *parentMenu,
-               int id,
-               const wxString& text,
-               const wxString& help,
-               bool isCheckable,
-               wxMenu *subMenu = NULL)
-    );
-#endif
-
     void SetBitmaps(const wxBitmapBundle& bmpChecked,
                     const wxBitmapBundle& bmpUnchecked = wxNullBitmap)
     {

include/wx/msw/ole/activex.h

@@ -140,12 +140,6 @@ protected:
     I *m_interface;
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-// this macro is kept for compatibility with older wx versions
-#define WX_DECLARE_AUTOOLE(wxAutoOleInterfaceType, I) \
-    typedef wxAutoOleInterface<I> wxAutoOleInterfaceType;
-#endif // WXWIN_COMPATIBILITY_2_8
-
 typedef wxAutoOleInterface<IDispatch> wxAutoIDispatch;
 typedef wxAutoOleInterface<IOleClientSite> wxAutoIOleClientSite;
 typedef wxAutoOleInterface<IUnknown> wxAutoIUnknown;

include/wx/msw/panel.h

@@ -31,18 +31,6 @@ public:
         Create(parent, winid, pos, size, style, name);
     }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxASCII_STR(wxPanelNameStr))
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };

include/wx/osx/cursor.h

@@ -28,9 +28,6 @@ public:
              int hotSpotX = 0, int hotSpotY = 0);
 
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
     virtual ~wxCursor();
 
     void MacInstall() const ;

include/wx/osx/glcanvas.h

@@ -116,47 +116,6 @@ public:
     // update the view port of the current context to match this window
     void SetViewport();
 
-
-    // deprecated methods
-    // ------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLContext *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLCanvas *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // implementation-only from now on
 
 protected:

include/wx/osx/window.h

@@ -209,9 +209,6 @@ public:
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 
-#if WXWIN_COMPATIBILITY_2_8
-    bool                MacIsUserPane();
-#endif
     bool                MacIsUserPane() const;
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;

include/wx/propgrid/property.h

@@ -491,11 +491,6 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
 // the actual displayed value is blank.
 #define wxPG_ATTR_HINT                      wxS("Hint")
 
-#if wxPG_COMPATIBILITY_1_4
-//  Ddeprecated. Use "Hint" (wxPG_ATTR_HINT) instead.
-#define wxPG_ATTR_INLINE_HELP               wxS("InlineHelp")
-#endif
-
 // Universal, wxArrayString. Set to enable auto-completion in any
 // wxTextCtrl-based property editor.
 #define wxPG_ATTR_AUTOCOMPLETE              wxS("AutoComplete")
@@ -634,10 +629,6 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
 #define wxPG_ATTR_UNITS                   wxPGGlobalVars->m_strUnits
 #undef wxPG_ATTR_HINT
 #define wxPG_ATTR_HINT                    wxPGGlobalVars->m_strHint
-#if wxPG_COMPATIBILITY_1_4
-#undef wxPG_ATTR_INLINE_HELP
-#define wxPG_ATTR_INLINE_HELP             wxPGGlobalVars->m_strInlineHelp
-#endif
 
 // -----------------------------------------------------------------------
 
@@ -1352,11 +1343,6 @@ public:
     // will result in run-time assertion failure.
     virtual wxString GetValueAsString( int argFlags = 0 ) const;
 
-#if wxPG_COMPATIBILITY_1_4
-    // Synonymous to GetValueAsString().
-    wxDEPRECATED( wxString GetValueString( int argFlags = 0 ) const );
-#endif
-
     // Returns wxPGCell of given column.
     // Const version of this member function returns 'default'
     // wxPGCell object if the property itself didn't hold
@@ -1829,12 +1815,6 @@ public:
     // ChildChanged-calls.
     void AdaptListToValue( wxVariant& list, wxVariant* value ) const;
 
-#if wxPG_COMPATIBILITY_1_4
-    // Adds a private child property.
-    // Use AddPrivateChild() instead.
-    wxDEPRECATED( void AddChild( wxPGProperty* prop ) );
-#endif
-
     // Adds a private child property. If you use this instead of
     // wxPropertyGridInterface::Insert() or
     // wxPropertyGridInterface::AppendIn(), then property's parental

include/wx/propgrid/propgrid.h

@@ -112,10 +112,6 @@ public:
     const wxString      m_strHint;
 #endif // WXWIN_COMPATIBILITY_3_0
 
-#if wxPG_COMPATIBILITY_1_4
-    wxPGCachedString    m_strInlineHelp;
-#endif
-
     // If true then some things are automatically translated
     bool                m_autoGetTranslation;
 
@@ -212,12 +208,6 @@ wxPG_WINDOW_STYLE_MASK = wxPG_AUTO_SORT|wxPG_HIDE_CATEGORIES|wxPG_BOLD_MODIFIED|
                          wxPG_DESCRIPTION|wxPG_NO_INTERNAL_BORDER
 };
 
-#if wxPG_COMPATIBILITY_1_4
-    // In wxPG 1.4 this was used to enable now-default theme border support
-    // in wxPropertyGridManager.
-    #define wxPG_THEME_BORDER           0x00000000
-#endif
-
 
 // NOTE: wxPG_EX_xxx are extra window styles and must be set using
 // SetExtraStyle() member function.
@@ -312,10 +302,6 @@ wxPG_EX_WINDOW_PGMAN_STYLE_MASK = wxPG_EX_NO_FLAT_TOOLBAR|wxPG_EX_MODE_BUTTONS|w
 wxPG_EX_WINDOW_STYLE_MASK = wxPG_EX_WINDOW_PG_STYLE_MASK|wxPG_EX_WINDOW_PGMAN_STYLE_MASK
 };
 
-#if wxPG_COMPATIBILITY_1_4
-    #define wxPG_EX_DISABLE_TLP_TRACKING    0x00000000
-#endif
-
 // Combines various styles.
 #define wxPG_DEFAULT_STYLE          (0)
 

include/wx/propgrid/propgriddefs.h

@@ -177,12 +177,6 @@ class WXDLLIMPEXP_FWD_CORE wxFont;
 // (for tree buttons)
 //#undef wxPG_ICON_WIDTH
 
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxPG_COMPATIBILITY_1_4      1
-#else
-    #define wxPG_COMPATIBILITY_1_4      0
-#endif
-
 // Set 1 to include advanced properties (wxFontProperty, wxColourProperty, etc.)
 #ifndef wxPG_INCLUDE_ADVPROPS
     #define wxPG_INCLUDE_ADVPROPS           1

include/wx/qt/cursor.h

@@ -17,9 +17,6 @@ class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
 public:
     wxCursor() { }
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
     wxCursor(const char* const* xpmData);

include/wx/rawbmp.h

@@ -675,11 +675,6 @@ struct wxPixelDataOut<wxBitmap>
             // else: don't call UngetRawData() if GetRawData() failed
         }
 
-#if WXWIN_COMPATIBILITY_2_8
-        // not needed anymore, calls to it should be simply removed
-        wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE )
-#endif
-
     // private: -- see comment in the beginning of the file
 
         // the bitmap we're associated with

include/wx/scrolwin.h

@@ -245,12 +245,6 @@ public:
 #endif // wxUSE_MOUSEWHEEL
     void HandleOnChildFocus(wxChildFocusEvent& event);
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-        void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     // get pointer to our scroll rect if we use it or NULL
     const wxRect *GetScrollRect() const

include/wx/sizer.h

@@ -447,15 +447,6 @@ public:
 
     void AssignSpacer(int w, int h) { AssignSpacer(wxSize(w, h)); }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // these functions do not free the old sizer/spacer and so can easily
-    // provoke the memory leaks and so shouldn't be used, use Assign() instead
-    wxDEPRECATED( void SetWindow(wxWindow *window) );
-    wxDEPRECATED( void SetSizer(wxSizer *sizer) );
-    wxDEPRECATED( void SetSpacer(const wxSize& size) );
-    wxDEPRECATED( void SetSpacer(int width, int height) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     // common part of several ctors
     void Init() { m_userData = NULL; m_kind = Item_None; }
@@ -703,10 +694,6 @@ public:
     wxSize Fit( wxWindow *window );
     void FitInside( wxWindow *window );
     void SetSizeHints( wxWindow *window );
-#if WXWIN_COMPATIBILITY_2_8
-    // This only calls FitInside() since 2.9
-    wxDEPRECATED( void SetVirtualSizeHints( wxWindow *window ) );
-#endif
 
     wxSizerItemList& GetChildren()
         { return m_children; }
@@ -1151,30 +1138,6 @@ private:
 // inline functions implementation
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_8
-
-inline void wxSizerItem::SetWindow(wxWindow *window)
-{
-    DoSetWindow(window);
-}
-
-inline void wxSizerItem::SetSizer(wxSizer *sizer)
-{
-    DoSetSizer(sizer);
-}
-
-inline void wxSizerItem::SetSpacer(const wxSize& size)
-{
-    DoSetSpacer(size);
-}
-
-inline void wxSizerItem::SetSpacer(int width, int height)
-{
-    DoSetSpacer(wxSize(width, height));
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 inline wxSizerItem*
 wxSizer::Insert(size_t index, wxSizerItem *item)
 {

include/wx/slider.h

@@ -99,10 +99,6 @@ public:
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
-#endif
-
 protected:
     // Platform-specific implementation of SetTickFreq
     virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ }

include/wx/string.h

@@ -118,31 +118,6 @@ namespace wxPrivate
 // constants
 // ----------------------------------------------------------------------------
 
-// ---------------------------------------------------------------------------
-// global functions complementing standard C string library replacements for
-// strlen() and portable strcasecmp()
-//---------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-// Use wxXXX() functions from wxcrt.h instead! These functions are for
-// backwards compatibility only.
-
-// checks whether the passed in pointer is NULL and if the string is empty
-wxDEPRECATED_MSG("use wxIsEmpty() instead")
-inline bool IsEmpty(const char *p) { return (!p || !*p); }
-
-// safe version of strlen() (returns 0 if passed NULL pointer)
-wxDEPRECATED_MSG("use wxStrlen() instead")
-inline size_t Strlen(const char *psz)
-  { return psz ? strlen(psz) : 0; }
-
-// portable strcasecmp/_stricmp
-wxDEPRECATED_MSG("use wxStricmp() instead")
-inline int Stricmp(const char *psz1, const char *psz2)
-    { return wxCRT_StricmpA(psz1, psz2); }
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // wxCStrData
 // ----------------------------------------------------------------------------
@@ -1992,11 +1967,6 @@ public:
       // string += string
   wxString& operator<<(const wxString& s)
   {
-#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-    wxASSERT_MSG( s.IsValid(),
-                  wxT("did you forget to call UngetWriteBuf()?") );
-#endif
-
     append(s);
     return *this;
   }
@@ -2366,16 +2336,6 @@ public:
     // minimize the string's memory
     // only works if the data of this string is not shared
   bool Shrink();
-#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-    // These are deprecated, use wxStringBuffer or wxStringBufferLength instead
-    //
-    // get writable buffer of at least nLen bytes. Unget() *must* be called
-    // a.s.a.p. to put string back in a reasonable state!
-  wxDEPRECATED( wxStringCharType *GetWriteBuf(size_t nLen) );
-    // call this immediately after GetWriteBuf() has been used
-  wxDEPRECATED( void UngetWriteBuf() );
-  wxDEPRECATED( void UngetWriteBuf(size_t nLen) );
-#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && wxUSE_UNICODE_UTF8
 
   // wxWidgets version 1 compatibility functions
 
@@ -4450,14 +4410,6 @@ void wxStringIteratorNode::clear()
 }
 #endif // wxUSE_UNICODE_UTF8
 
-#if WXWIN_COMPATIBILITY_2_8
-    // lot of code out there doesn't explicitly include wx/crt.h, but uses
-    // CRT wrappers that are now declared in wx/wxcrt.h and wx/wxcrtvararg.h,
-    // so let's include this header now that wxString is defined and it's safe
-    // to do it:
-    #include "wx/crt.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // Checks on wxString characters
 // ----------------------------------------------------------------------------

include/wx/tbarbase.h

@@ -495,65 +495,6 @@ public:
     wxToolBarToolBase *GetToolByPos(int pos) { return m_tools[pos]; }
     const wxToolBarToolBase *GetToolByPos(int pos) const { return m_tools[pos]; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // the old versions of the various methods kept for compatibility
-    // don't use in the new code!
-    // --------------------------------------------------------------
-    wxDEPRECATED_INLINE(
-    wxToolBarToolBase *AddTool(int toolid,
-                               const wxBitmap& bitmap,
-                               const wxBitmap& bmpDisabled,
-                               bool toggle = false,
-                               wxObject *clientData = NULL,
-                               const wxString& shortHelpString = wxEmptyString,
-                               const wxString& longHelpString = wxEmptyString)
-    ,
-        return AddTool(toolid, wxEmptyString,
-                       bitmap, bmpDisabled,
-                       toggle ? wxITEM_CHECK : wxITEM_NORMAL,
-                       shortHelpString, longHelpString, clientData);
-    )
-    wxDEPRECATED_INLINE(
-    wxToolBarToolBase *AddTool(int toolid,
-                               const wxBitmap& bitmap,
-                               const wxString& shortHelpString = wxEmptyString,
-                               const wxString& longHelpString = wxEmptyString)
-    ,
-        return AddTool(toolid, wxEmptyString,
-                       bitmap, wxBitmapBundle(), wxITEM_NORMAL,
-                       shortHelpString, longHelpString, NULL);
-    )
-    wxDEPRECATED_INLINE(
-    wxToolBarToolBase *AddTool(int toolid,
-                               const wxBitmap& bitmap,
-                               const wxBitmap& bmpDisabled,
-                               bool toggle,
-                               wxCoord xPos,
-                               wxCoord yPos = wxDefaultCoord,
-                               wxObject *clientData = NULL,
-                               const wxString& shortHelp = wxEmptyString,
-                               const wxString& longHelp = wxEmptyString)
-    ,
-        return DoAddTool(toolid, wxEmptyString, bitmap, bmpDisabled,
-                         toggle ? wxITEM_CHECK : wxITEM_NORMAL,
-                         shortHelp, longHelp, clientData, xPos, yPos);
-    )
-    wxDEPRECATED_INLINE(
-    wxToolBarToolBase *InsertTool(size_t pos,
-                                  int toolid,
-                                  const wxBitmap& bitmap,
-                                  const wxBitmap& bmpDisabled = wxNullBitmap,
-                                  bool toggle = false,
-                                  wxObject *clientData = NULL,
-                                  const wxString& shortHelp = wxEmptyString,
-                                  const wxString& longHelp = wxEmptyString)
-    ,
-        return InsertTool(pos, toolid, wxEmptyString, bitmap, bmpDisabled,
-                          toggle ? wxITEM_CHECK : wxITEM_NORMAL,
-                          shortHelp, longHelp, clientData);
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
     // event handlers
     // --------------
 
@@ -718,15 +659,6 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxToolBarBase);
 };
 
-// deprecated function for creating the image for disabled buttons, use
-// wxImage::ConvertToGreyscale() instead
-#if WXWIN_COMPATIBILITY_2_8
-
-wxDEPRECATED( bool wxCreateGreyedImage(const wxImage& in, wxImage& out) );
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
 #endif // wxUSE_TOOLBAR
 
 #endif

include/wx/textctrl.h

@@ -90,11 +90,6 @@ const wxTextCoord wxInvalidTextCoord    = -2;
 #define wxTE_WORDWRAP       0x0001  // wrap only at words boundaries
 #define wxTE_BESTWRAP       0x0000  // this is the default
 
-#if WXWIN_COMPATIBILITY_2_8
-    // this style is (or at least should be) on by default now, don't use it
-    #define wxTE_AUTO_SCROLL    0
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
 // wxTE_RICH controls - can be used together with or instead of wxTE_RICH
 #define wxTE_RICH2          0x8000

include/wx/thread.h

@@ -74,15 +74,7 @@ enum wxThreadWait
 {
     wxTHREAD_WAIT_BLOCK,
     wxTHREAD_WAIT_YIELD,       // process events while waiting; MSW only
-
-    // For compatibility reasons we use wxTHREAD_WAIT_YIELD by default as this
-    // was the default behaviour of wxMSW 2.8 but it should be avoided as it's
-    // dangerous and not portable.
-#if WXWIN_COMPATIBILITY_2_8
-    wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_YIELD
-#else
     wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_BLOCK
-#endif
 };
 
 // Obsolete synonyms for wxPRIORITY_XXX for backwards compatibility-only
@@ -713,10 +705,6 @@ public:
     // destructor deletes m_thread
     virtual ~wxThreadHelper() { KillThread(); }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( wxThreadError Create(unsigned int stackSize = 0) );
-#endif
-
     // create a new thread (and optionally set the stack size on platforms that
     // support/need that), call Run() to start it
     wxThreadError CreateThread(wxThreadKind kind = wxTHREAD_JOINABLE,
@@ -752,11 +740,6 @@ protected:
     friend class wxThreadHelperThread;
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-inline wxThreadError wxThreadHelper::Create(unsigned int stackSize)
-{ return CreateThread(m_kind, stackSize); }
-#endif
-
 // call Entry() in owner, put it down here to avoid circular declarations
 inline void *wxThreadHelperThread::Entry()
 {

include/wx/toolbook.h

@@ -31,11 +31,6 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOOLBOOK_PAGE_CHANGING, wxBook
 // Use wxTB_HORZ_LAYOUT style for the controlling toolbar
 #define wxTBK_HORZ_LAYOUT          0x8000
 
-// deprecated synonym, don't use
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxBK_BUTTONBAR wxTBK_BUTTONBAR
-#endif
-
 // ----------------------------------------------------------------------------
 // wxToolbook
 // ----------------------------------------------------------------------------

include/wx/toplevel.h

@@ -75,13 +75,6 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[];
 #define wxTINY_CAPTION          0x0080  // clashes with wxNO_DEFAULT
 #define wxRESIZE_BORDER         0x0040  // == wxCLOSE
 
-#if WXWIN_COMPATIBILITY_2_8
-    // HORIZ and VERT styles are equivalent anyhow so don't use different names
-    // for them
-    #define wxTINY_CAPTION_HORIZ    wxTINY_CAPTION
-    #define wxTINY_CAPTION_VERT     wxTINY_CAPTION
-#endif
-
 // default style
 #define wxDEFAULT_FRAME_STYLE \
             (wxSYSTEM_MENU | \

include/wx/treebase.h

@@ -123,10 +123,6 @@ static const int wxTREE_ITEMSTATE_PREV  = -3;   // cycle to the previous state
 #define wxTR_SINGLE                  0x0000     // for convenience
 #define wxTR_MULTIPLE                0x0020     // can select multiple items
 
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxTR_EXTENDED            0x0040     // deprecated, don't use
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080     // what it says
 
 #define wxTR_EDIT_LABELS             0x0200     // can edit item labels

include/wx/univ/panel.h

@@ -31,18 +31,6 @@ public:
 
     virtual bool IsCanvasWindow() const { return true; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxASCII_STR(wxPanelNameStr))
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };

include/wx/utils.h

@@ -106,22 +106,6 @@ wxClip(T1 a, T2 b, T3 c)
     typedef long wxMemorySize;
 #endif
 
-// ----------------------------------------------------------------------------
-// String functions (deprecated, use wxString)
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-// A shorter way of using strcmp
-wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2),
-    return wxCRT_StrcmpA(s1, s2) == 0; )
-
-#if wxUSE_UNICODE
-wxDEPRECATED_INLINE(inline bool wxStringEq(const wchar_t *s1, const wchar_t *s2),
-    return wxCRT_StrcmpW(s1, s2) == 0; )
-#endif // wxUSE_UNICODE
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // Miscellaneous functions
 // ----------------------------------------------------------------------------
@@ -508,11 +492,6 @@ WXDLLIMPEXP_BASE void wxMilliSleep(unsigned long milliseconds);
 // Sleep for a given amount of microseconds
 WXDLLIMPEXP_BASE void wxMicroSleep(unsigned long microseconds);
 
-#if WXWIN_COMPATIBILITY_2_8
-// Sleep for a given amount of milliseconds (old, bad name), use wxMilliSleep
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxUsleep(unsigned long milliseconds) );
-#endif
-
 // Get the process id of the current process
 WXDLLIMPEXP_BASE unsigned long wxGetProcessId();
 
@@ -540,29 +519,6 @@ WXDLLIMPEXP_BASE bool wxSetEnv(const wxString& var, const wxString& value);
 // remove the env var from environment
 WXDLLIMPEXP_BASE bool wxUnsetEnv(const wxString& var);
 
-#if WXWIN_COMPATIBILITY_2_8
-inline bool wxSetEnv(const wxString& var, const char *value)
-    { return wxSetEnv(var, wxString(value)); }
-inline bool wxSetEnv(const wxString& var, const wchar_t *value)
-    { return wxSetEnv(var, wxString(value)); }
-template<typename T>
-inline bool wxSetEnv(const wxString& var, const wxScopedCharTypeBuffer<T>& value)
-    { return wxSetEnv(var, wxString(value)); }
-inline bool wxSetEnv(const wxString& var, const wxCStrData& value)
-    { return wxSetEnv(var, wxString(value)); }
-
-// this one is for passing NULL directly - don't use it, use wxUnsetEnv instead
-wxDEPRECATED( inline bool wxSetEnv(const wxString& var, int value) );
-inline bool wxSetEnv(const wxString& var, int value)
-{
-    wxASSERT_MSG( value == 0, "using non-NULL integer as string?" );
-
-    wxUnusedVar(value); // fix unused parameter warning in release build
-
-    return wxUnsetEnv(var);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // Retrieve the complete environment by filling specified map.
 // Returns true on success or false if an error occurred.
 WXDLLIMPEXP_BASE bool wxGetEnvMap(wxEnvVariableHashMap *map);

include/wx/validate.h

@@ -80,12 +80,6 @@ public:
     // this function is deprecated because it handled its parameter
     // unnaturally: it disabled the bell when it was true, not false as could
     // be expected; use SuppressBellOnError() instead
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(static
-        void SetBellOnError(bool doIt = true),
-        ms_isSilent = doIt;
-    )
-#endif
 
 protected:
     wxWindow *m_validatorWindow;

include/wx/vector.h

@@ -584,10 +584,6 @@ public:
         return begin() + idx;
     }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( size_type erase(size_type n) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 private:
     static const size_type ALLOC_INITIAL_SIZE = 16;
 
@@ -649,16 +645,6 @@ private:
     value_type *m_values;
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-template<typename T>
-inline typename wxVector<T>::size_type wxVector<T>::erase(size_type n)
-{
-    erase(begin() + n);
-    return n;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
 
 namespace wxPrivate
 {
@@ -721,10 +707,4 @@ inline void wxShrinkToFit(wxVector<T>& v)
 #endif
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-    #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector<obj> cls
-    #define _WX_DECLARE_VECTOR(obj, cls, exp) WX_DECLARE_VECTORBASE(obj, cls)
-    #define WX_DECLARE_VECTOR(obj, cls) WX_DECLARE_VECTORBASE(obj, cls)
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #endif // _WX_VECTOR_H_

include/wx/vscroll.h

@@ -39,8 +39,8 @@ class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler;
 //       |            V               V             |           |
 //       |           wxVarHVScrollHelper            |           |
 //       |                      |                   |           |
-//       |                      |                   V           |
+//       |                      |                   |           |
-//       |         wxPanel      |    wxVarVScrollLegacyAdaptor  |
+//       |         wxPanel      |                   |           |
 //       |         /  \  \      |                   |           |
 //       |        /    \  `-----|----------.        |           |
 //       |       /      \       |           \       |           |
@@ -539,118 +539,6 @@ public:
 };
 
 
-
-#if WXWIN_COMPATIBILITY_2_8
-
-// ===========================================================================
-// wxVarVScrollLegacyAdaptor
-// ===========================================================================
-
-// Provides backwards compatible API for applications originally built using
-// wxVScrolledWindow in 2.6 or 2.8. Originally, wxVScrolledWindow referred
-// to scrolling "lines". We use "units" in wxVarScrollHelperBase to avoid
-// implying any orientation (since the functions are used for both horizontal
-// and vertical scrolling in derived classes). And in the new
-// wxVScrolledWindow and wxHScrolledWindow classes, we refer to them as
-// "rows" and "columns", respectively. This is to help clear some confusion
-// in not only those classes, but also in wxHVScrolledWindow where functions
-// are inherited from both.
-
-class WXDLLIMPEXP_CORE wxVarVScrollLegacyAdaptor : public wxVarVScrollHelper
-{
-public:
-    // constructors and such
-    // ---------------------
-    wxVarVScrollLegacyAdaptor(wxWindow *winToScroll)
-        : wxVarVScrollHelper(winToScroll)
-    {
-    }
-
-    // accessors
-    // ---------
-
-    // this is the same as GetVisibleRowsBegin(), exists to match
-    // GetLastVisibleLine() and for backwards compatibility only
-    wxDEPRECATED( size_t GetFirstVisibleLine() const );
-
-    // get the last currently visible line
-    //
-    // this function is unsafe as it returns (size_t)-1 (i.e. a huge positive
-    // number) if the control is empty, use GetVisibleRowsEnd() instead, this
-    // one is kept for backwards compatibility
-    wxDEPRECATED( size_t GetLastVisibleLine() const );
-
-    // "line" to "unit" compatibility functions
-    // ----------------------------------------
-
-    // get the number of lines this window contains (set by SetLineCount())
-    wxDEPRECATED( size_t GetLineCount() const );
-
-    // set the number of lines the helper contains: the derived class must
-    // provide the sizes for all lines with indices up to the one given here
-    // in its OnGetLineHeight()
-    wxDEPRECATED( void SetLineCount(size_t count) );
-
-    // redraw the specified line
-    wxDEPRECATED( virtual void RefreshLine(size_t line) );
-
-    // redraw all lines in the specified range (inclusive)
-    wxDEPRECATED( virtual void RefreshLines(size_t from, size_t to) );
-
-    // scroll to the specified line: it will become the first visible line in
-    // the window
-    //
-    // return true if we scrolled the window, false if nothing was done
-    wxDEPRECATED( bool ScrollToLine(size_t line) );
-
-    // scroll by the specified number of lines/pages
-    wxDEPRECATED( virtual bool ScrollLines(int lines) );
-    wxDEPRECATED( virtual bool ScrollPages(int pages) );
-
-protected:
-    // unless the code has been updated to override OnGetRowHeight() instead,
-    // this function must be overridden in the derived class and it should
-    // return the height of the given row in pixels
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual wxCoord OnGetLineHeight(size_t n) const );
-
-    // forwards the calls from base class pure virtual function to pure virtual
-    // OnGetLineHeight instead (backwards compatible name)
-    // note that we don't need to forward OnGetUnitSize() as it is already
-    // forwarded to OnGetRowHeight() in wxVarVScrollHelper
-    virtual wxCoord OnGetRowHeight(size_t n) const;
-
-    // this function doesn't have to be overridden but it may be useful to do
-    // it if calculating the lines heights is a relatively expensive operation
-    // as it gives the user code a possibility to calculate several of them at
-    // once
-    //
-    // OnGetLinesHint() is normally called just before OnGetLineHeight() but you
-    // shouldn't rely on the latter being called for all lines in the interval
-    // specified here. It is also possible that OnGetLineHeight() will be
-    // called for the lines outside of this interval, so this is really just a
-    // hint, not a promise.
-    //
-    // finally note that lineMin is inclusive, while lineMax is exclusive, as
-    // usual
-    wxDEPRECATED_BUT_USED_INTERNALLY( virtual void OnGetLinesHint(
-        size_t lineMin, size_t lineMax) const );
-
-    // forwards the calls from base class pure virtual function to pure virtual
-    // OnGetLinesHint instead (backwards compatible name)
-    void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const;
-};
-
-#else // !WXWIN_COMPATIBILITY_2_8
-
-// shortcut to avoid checking compatibility modes later
-// remove this and all references to wxVarVScrollLegacyAdaptor once
-// wxWidgets 2.6 and 2.8 compatibility is removed
-typedef wxVarVScrollHelper wxVarVScrollLegacyAdaptor;
-
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
-
-
 // this macro must be used in declaration of wxVarScrollHelperBase-derived
 // classes
 #define WX_FORWARD_TO_VAR_SCROLL_HELPER()                                     \
@@ -676,14 +564,14 @@ public:                                                                       \
 // of the window and not its entire client area.
 
 class WXDLLIMPEXP_CORE wxVScrolledWindow : public wxPanel,
-                                      public wxVarVScrollLegacyAdaptor
+                                      public wxVarVScrollHelper
 {
 public:
     // constructors and such
     // ---------------------
 
     // default ctor, you must call Create() later
-    wxVScrolledWindow() : wxVarVScrollLegacyAdaptor(this) { }
+    wxVScrolledWindow() : wxVarVScrollHelper(this) { }
 
     // normal ctor, no need to call Create() after this one
     //
@@ -695,7 +583,7 @@ public:
                       const wxSize& size = wxDefaultSize,
                       long style = 0,
                       const wxString& name = wxASCII_STR(wxPanelNameStr))
-    : wxVarVScrollLegacyAdaptor(this)
+    : wxVarVScrollHelper(this)
     {
         (void)Create(parent, id, pos, size, style, name);
     }
@@ -714,15 +602,6 @@ public:
         return wxPanel::Create(parent, id, pos, size, style | wxVSCROLL, name);
     }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // Make sure we prefer our version of HitTest rather than wxWindow's
-    // These functions should no longer be masked in favor of VirtualHitTest()
-    int HitTest(wxCoord WXUNUSED(x), wxCoord y) const
-        { return wxVarVScrollHelper::VirtualHitTest(y); }
-    int HitTest(const wxPoint& pt) const
-        { return HitTest(pt.x, pt.y); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
     WX_FORWARD_TO_VAR_SCROLL_HELPER()
 
 #ifdef __WXMAC__

include/wx/window.h

@@ -409,21 +409,10 @@ public:
         // returns the results.
     virtual wxSize GetEffectiveMinSize() const;
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_MSG("use GetEffectiveMinSize() instead")
-    wxSize GetBestFittingSize() const;
-#endif // WXWIN_COMPATIBILITY_2_8
-
         // A 'Smart' SetSize that will fill in default size values with 'best'
         // size.  Sets the minsize to what was passed in.
     void SetInitialSize(const wxSize& size=wxDefaultSize);
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_MSG("use SetInitialSize() instead")
-    void SetBestFittingSize(const wxSize& size=wxDefaultSize);
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
         // the generic centre function - centers the window on parent by`
         // default or on screen if it doesn't have parent or
         // wxCENTER_ON_SCREEN flag is given
@@ -458,15 +447,6 @@ public:
     { DoSetSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y, incSize.x, incSize.y); }
 
 
-#if WXWIN_COMPATIBILITY_2_8
-    // these are useless and do nothing since wxWidgets 2.9
-    wxDEPRECATED( virtual void SetVirtualSizeHints( int minW, int minH,
-                                      int maxW = wxDefaultCoord, int maxH = wxDefaultCoord ) );
-    wxDEPRECATED( void SetVirtualSizeHints( const wxSize& minSize,
-                                            const wxSize& maxSize=wxDefaultSize) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
         // Call these to override what GetBestSize() returns. This
         // method is only virtual because it is overridden in wxTLW
         // as a different API for SetSizeHints().
@@ -692,11 +672,6 @@ public:
 
     bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; }
 
-#if WXWIN_COMPATIBILITY_2_8
-        // make the window modal (all other windows unresponsive)
-    wxDEPRECATED( virtual void MakeModal(bool modal = true) );
-#endif
-
     // (primitive) theming support
     // ---------------------------
 
@@ -1442,12 +1417,6 @@ public:
         // associate this help text with this window
     void SetHelpText(const wxString& text);
 
-#if WXWIN_COMPATIBILITY_2_8
-    // Associate this help text with all windows with the same id as this one.
-    // Don't use this, do wxHelpProvider::Get()->AddHelp(id, text);
-    wxDEPRECATED( void SetHelpTextForId(const wxString& text) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
         // get the help string associated with the given position in this window
         //
         // notice that pt may be invalid if event origin is keyboard or unknown
@@ -1880,15 +1849,6 @@ protected:
     // recalculated each time the value is needed.
     wxSize m_bestSizeCache;
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_MSG("use SetInitialSize() instead.")
-    void SetBestSize(const wxSize& size);
-    wxDEPRECATED_MSG("use SetInitialSize() instead.")
-    virtual void SetInitialBestSize(const wxSize& size);
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
-
     // more pure virtual functions
     // ---------------------------
 
@@ -2032,30 +1992,6 @@ private:
 };
 
 
-#if WXWIN_COMPATIBILITY_2_8
-// Inlines for some deprecated methods
-inline wxSize wxWindowBase::GetBestFittingSize() const
-{
-    return GetEffectiveMinSize();
-}
-
-inline void wxWindowBase::SetBestFittingSize(const wxSize& size)
-{
-    SetInitialSize(size);
-}
-
-inline void wxWindowBase::SetBestSize(const wxSize& size)
-{
-    SetInitialSize(size);
-}
-
-inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
-{
-    SetInitialSize(size);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
 // ----------------------------------------------------------------------------
 // now include the declaration of wxWindow class
 // ----------------------------------------------------------------------------

include/wx/wxcrt.h

@@ -1100,15 +1100,6 @@ inline bool wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c) != 0; }
 inline wxUniChar wxTolower(const wxUniChar& c) { return wxCRT_TolowerW(c); }
 inline wxUniChar wxToupper(const wxUniChar& c) { return wxCRT_ToupperW(c); }
 
-#if WXWIN_COMPATIBILITY_2_8
-// we had goofed and defined wxIsctrl() instead of (correct) wxIscntrl() in the
-// initial versions of this header -- now it is too late to remove it so
-// although we fixed the function/macro name above, still provide the
-// backwards-compatible synonym.
-wxDEPRECATED( inline int wxIsctrl(const wxUniChar& c) );
-inline int wxIsctrl(const wxUniChar& c) { return wxIscntrl(c); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
 inline bool wxIsascii(const wxUniChar& c) { return c.IsAscii(); }
 
 #endif /* _WX_WXCRT_H_ */

include/wx/x11/cursor.h

@@ -24,9 +24,6 @@ class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
 public:
     wxCursor();
     wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
     wxCursor(const char* const* xpmData);

include/wx/xml/xml.h

@@ -83,13 +83,6 @@ private:
     wxXmlAttribute *m_next;
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-    // NB: #define is used instead of typedef so that forward declarations
-    //     continue to work
-    #define wxXmlProperty wxXmlAttribute
-#endif
-
-
 // Represents node in XML document. Node has name and may have content and
 // attributes. Most common node types are wxXML_TEXT_NODE (name and attributes
 // are irrelevant) and wxXML_ELEMENT_NODE (e.g. in <title>hi</title> there is
@@ -175,38 +168,6 @@ public:
     bool GetNoConversion() const { return m_noConversion; }
     void SetNoConversion(bool noconversion) { m_noConversion = noconversion; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( inline wxXmlAttribute *GetProperties() const );
-    wxDEPRECATED( inline bool GetPropVal(const wxString& propName,
-                                         wxString *value) const );
-    wxDEPRECATED( inline wxString GetPropVal(const wxString& propName,
-                                             const wxString& defaultVal) const );
-    wxDEPRECATED( inline bool HasProp(const wxString& propName) const );
-
-    wxDEPRECATED( inline void SetProperties(wxXmlAttribute *prop) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    // The following three functions are backward compatibility, but because
-    // they were virtual, we must make it possible to override them. This
-    // is done by calling e.g. AddProperty() from AddAttribute(), so we have
-    // to keep AddProperty() even if 2.8 compatibility is off. To prevent
-    // old code from compiling in that case, we make them private and
-    // non-virtual. (This can be removed when WXWIN_COMPATIBILITY_2_8 is
-    // removed, we'll have just *Attribute versions then.)
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void AddProperty(const wxString& name, const wxString& value) );
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual bool DeleteProperty(const wxString& name) );
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void AddProperty(wxXmlAttribute *attr) );
-#else
-private:
-    void AddProperty(const wxString& name, const wxString& value);
-    bool DeleteProperty(const wxString& name);
-    void AddProperty(wxXmlAttribute *attr);
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
-
 private:
     wxXmlNodeType m_type;
     wxString m_name;
@@ -220,22 +181,6 @@ private:
     void DoCopy(const wxXmlNode& node);
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-inline wxXmlAttribute *wxXmlNode::GetProperties() const
-    { return GetAttributes(); }
-inline bool wxXmlNode::GetPropVal(const wxString& propName,
-                                  wxString *value) const
-    { return GetAttribute(propName, value); }
-inline wxString wxXmlNode::GetPropVal(const wxString& propName,
-                                      const wxString& defaultVal) const
-    { return GetAttribute(propName, defaultVal); }
-inline bool wxXmlNode::HasProp(const wxString& propName) const
-    { return HasAttribute(propName); }
-inline void wxXmlNode::SetProperties(wxXmlAttribute *prop)
-    { SetAttributes(prop); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
 
 class WXDLLIMPEXP_XML wxXmlDoctype
 {

interface/wx/thread.h

@@ -668,14 +668,8 @@ enum wxThreadWait
 
     /**
         Default wait mode for wxThread::Wait() and wxThread::Delete().
-
-        For compatibility reasons, the default wait mode is currently
-        wxTHREAD_WAIT_YIELD if WXWIN_COMPATIBILITY_2_8 is defined (and it is
-        by default). However, as mentioned above, you're strongly encouraged to
-        not use wxTHREAD_WAIT_YIELD and pass wxTHREAD_WAIT_BLOCK to wxThread
-        method explicitly.
      */
-    wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_YIELD
+    wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_BLOCK
 };
 
 /**

samples/propgrid/propgrid.cpp

@@ -1657,12 +1657,12 @@ void FormMain::PopulateWithLibraryConfig ()
     ADD_WX_LIB_CONF( wxUSE_GUI )
 
     ADD_WX_LIB_CONF_GROUP("Compatibility Settings")
-#if defined(WXWIN_COMPATIBILITY_2_8)
-    ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_2_8 )
-#endif
 #if defined(WXWIN_COMPATIBILITY_3_0)
     ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_3_0 )
 #endif
+#if defined(WXWIN_COMPATIBILITY_3_2)
+    ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_3_2 )
+#endif
 #ifdef wxFONT_SIZE_COMPATIBILITY
     ADD_WX_LIB_CONF( wxFONT_SIZE_COMPATIBILITY )
 #else

src/common/artprov.cpp

@@ -634,17 +634,6 @@ bool wxArtProvider::HasNativeProvider()
 #endif
 }
 
-// ----------------------------------------------------------------------------
-// deprecated wxArtProvider methods
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-/* static */ void wxArtProvider::Insert(wxArtProvider *provider)
-{
-    PushBack(provider);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ============================================================================
 // wxArtProviderModule
 // ============================================================================

src/common/combocmn.cpp

@@ -2480,29 +2480,6 @@ wxPoint wxComboCtrlBase::DoGetMargins() const
     return wxPoint(m_marginLeft, -1);
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-void wxComboCtrlBase::SetTextIndent( int indent )
-{
-    if ( indent < 0 )
-    {
-        m_marginLeft = GetNativeTextIndent();
-        m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET);
-    }
-    else
-    {
-        m_marginLeft = indent;
-        m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET;
-    }
-
-    RecalcAndRefresh();
-}
-
-wxCoord wxComboCtrlBase::GetTextIndent() const
-{
-    return m_marginLeft;
-}
-#endif
-
 wxCoord wxComboCtrlBase::GetNativeTextIndent() const
 {
     return DEFAULT_TEXT_INDENT;

src/common/dcbase.cpp

@@ -1356,67 +1356,6 @@ void wxDC::DrawLabel(const wxString& text,
     m_pimpl->CalcBoundingBox(wxPoint(x0, y0), wxSize(width0, height));
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // for compatibility with the old code when wxCoord was long everywhere
-void wxDC::GetTextExtent(const wxString& string,
-                       long *x, long *y,
-                       long *descent,
-                       long *externalLeading,
-                       const wxFont *theFont) const
-    {
-        wxCoord x2, y2, descent2, externalLeading2;
-        m_pimpl->DoGetTextExtent(string, &x2, &y2,
-                        &descent2, &externalLeading2,
-                        theFont);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-        if ( descent )
-            *descent = descent2;
-        if ( externalLeading )
-            *externalLeading = externalLeading2;
-    }
-
-void wxDC::GetLogicalOrigin(long *x, long *y) const
-    {
-        wxCoord x2, y2;
-        m_pimpl->DoGetLogicalOrigin(&x2, &y2);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-    }
-
-void wxDC::GetDeviceOrigin(long *x, long *y) const
-    {
-        wxCoord x2, y2;
-        m_pimpl->DoGetDeviceOrigin(&x2, &y2);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-    }
-
-void wxDC::GetClippingBox(long *x, long *y, long *w, long *h) const
-    {
-        wxRect r;
-        m_pimpl->DoGetClippingRect(r);
-        if (x) *x = r.x;
-        if (y) *y = r.y;
-        if (w) *w = r.width;
-        if (h) *h = r.height;
-    }
-
-void wxDC::DrawObject(wxDrawObject* drawobject)
-{
-    drawobject->Draw(*this);
-    m_pimpl->CalcBoundingBox(drawobject->MinX(),drawobject->MinY(),
-                             drawobject->MaxX(),drawobject->MaxY());
-}
-
-#endif  // WXWIN_COMPATIBILITY_2_8
-
 /*
 Notes for wxWidgets DrawEllipticArcRot(...)
 

src/common/descrip.mms

@@ -232,7 +232,7 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
 OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
-	dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\
+        dynload.obj,fddlgcmn.obj,fs_mem.obj,\
 	gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
 	taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
 	combocmn.obj,cairo.obj
@@ -411,7 +411,6 @@ SOURCES = \
 		dpycmn.cpp,\
 		dseldlg.cpp,\
 		dynload.cpp,\
-		effects.cpp,\
 		fddlgcmn.cpp,\
 		fs_mem.cpp,\
 		gbsizer.cpp,\
@@ -648,7 +647,6 @@ dndcmn.obj : dndcmn.cpp
 dpycmn.obj : dpycmn.cpp
 dseldlg.obj : dseldlg.cpp
 dynload.obj : dynload.cpp
-effects.obj : effects.cpp
 fddlgcmn.obj : fddlgcmn.cpp
 fs_mem.obj : fs_mem.cpp
 gbsizer.obj : gbsizer.cpp

src/common/docview.cpp

@@ -465,29 +465,8 @@ bool wxDocument::Revert()
 
 
 // Get title, or filename if no title, else unnamed
-#if WXWIN_COMPATIBILITY_2_8
-bool wxDocument::GetPrintableName(wxString& buf) const
-{
-    // this function cannot only be overridden by the user code but also
-    // called by it so we need to ensure that we return the same thing as
-    // GetUserReadableName() but we can't call it because this would result in
-    // an infinite recursion, hence we use the helper DoGetUserReadableName()
-    buf = DoGetUserReadableName();
-
-    return true;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 wxString wxDocument::GetUserReadableName() const
 {
-#if WXWIN_COMPATIBILITY_2_8
-    // we need to call the old virtual function to ensure that the overridden
-    // version of it is still called
-    wxString name;
-    if ( GetPrintableName(name) )
-        return name;
-#endif // WXWIN_COMPATIBILITY_2_8
-
     return DoGetUserReadableName();
 }
 
@@ -1597,27 +1576,12 @@ wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const
 }
 
 // Make a default name for a new document
-#if WXWIN_COMPATIBILITY_2_8
-bool wxDocManager::MakeDefaultName(wxString& WXUNUSED(name))
-{
-    // we consider that this function can only be overridden by the user code,
-    // not called by it as it only makes sense to call it internally, so we
-    // don't bother to return anything from here
-    return false;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 wxString wxDocManager::MakeNewDocumentName()
 {
     wxString name;
 
-#if WXWIN_COMPATIBILITY_2_8
+    name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
-    if ( !MakeDefaultName(name) )
+    m_defaultDocumentNameCounter++;
-#endif // WXWIN_COMPATIBILITY_2_8
-    {
-        name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
-        m_defaultDocumentNameCounter++;
-    }
 
     return name;
 }

src/common/effects.cpp

@@ -1,125 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/effects.cpp
-// Purpose:     wxEffectsImpl implementation
-// Author:      Julian Smart
-// Modified by:
-// Created:     25/4/2000
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-
-#include "wx/effects.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dcmemory.h"
-    #include "wx/pen.h"
-    #include "wx/settings.h"
-    #include "wx/gdicmn.h"
-#endif //WX_PRECOMP
-
-#if WXWIN_COMPATIBILITY_2_8
-
-/*
- * wxEffectsImpl: various 3D effects
- */
-
-wxIMPLEMENT_CLASS(wxEffectsImpl, wxObject);
-
-// Assume system colours
-wxEffectsImpl::wxEffectsImpl()
-{
-    m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ;
-    m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ;
-    m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) ;
-    m_mediumShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
-    m_darkShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW) ;
-}
-
-// Going from lightest to darkest
-wxEffectsImpl::wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow,
-                const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow)
-{
-    m_highlightColour = highlightColour;
-    m_lightShadow = lightShadow;
-    m_faceColour = faceColour;
-    m_mediumShadow = mediumShadow;
-    m_darkShadow = darkShadow;
-}
-
-// Draw a sunken edge
-void wxEffectsImpl::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize))
-{
-    wxPen highlightPen(m_highlightColour, 1, wxPENSTYLE_SOLID);
-    wxPen lightShadowPen(m_lightShadow, 1, wxPENSTYLE_SOLID);
-    wxPen facePen(m_faceColour, 1, wxPENSTYLE_SOLID);
-    wxPen mediumShadowPen(m_mediumShadow, 1, wxPENSTYLE_SOLID);
-    wxPen darkShadowPen(m_darkShadow, 1, wxPENSTYLE_SOLID);
-
-    //// LEFT AND TOP
-    // Draw a medium shadow pen on left and top, followed by dark shadow line to
-    // right and below of these lines
-
-    dc.SetPen(mediumShadowPen);
-    dc.DrawLine(rect.x, rect.y, rect.x+rect.width-1, rect.y); // Top
-    dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height-1); // Left
-
-    dc.SetPen(darkShadowPen);
-    dc.DrawLine(rect.x+1, rect.y+1, rect.x+rect.width-2, rect.y+1); // Top
-    dc.DrawLine(rect.x+1, rect.y+1, rect.x+1, rect.y+rect.height-1); // Left
-
-    //// RIGHT AND BOTTOM
-
-    dc.SetPen(highlightPen);
-    dc.DrawLine(rect.x+rect.width-1, rect.y, rect.x+rect.width-1, rect.y+rect.height-1); // Right
-    dc.DrawLine(rect.x, rect.y+rect.height-1, rect.x+rect.width, rect.y+rect.height-1); // Bottom
-
-    dc.SetPen(lightShadowPen);
-    dc.DrawLine(rect.x+rect.width-2, rect.y+1, rect.x+rect.width-2, rect.y+rect.height-2); // Right
-    dc.DrawLine(rect.x+1, rect.y+rect.height-2, rect.x+rect.width-1, rect.y+rect.height-2); // Bottom
-
-    dc.SetPen(wxNullPen);
-}
-
-bool wxEffectsImpl::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap)
-{
-    int w = bitmap.GetWidth();
-    int h = bitmap.GetHeight();
-
-    wxMemoryDC dcMem;
-
-#if wxUSE_PALETTE
-    static bool hiColour = (wxDisplayDepth() >= 16) ;
-    if (bitmap.GetPalette() && !hiColour)
-    {
-        dc.SetPalette(* bitmap.GetPalette());
-        dcMem.SetPalette(* bitmap.GetPalette());
-    }
-#endif // wxUSE_PALETTE
-
-    dcMem.SelectObjectAsSource(bitmap);
-
-    int i, j;
-    for (i = rect.x; i < rect.x + rect.width; i += w)
-    {
-        for (j = rect.y; j < rect.y + rect.height; j+= h)
-            dc.Blit(i, j, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
-    }
-    dcMem.SelectObject(wxNullBitmap);
-
-#if wxUSE_PALETTE
-    if (bitmap.GetPalette() && !hiColour)
-    {
-        dc.SetPalette(wxNullPalette);
-        dcMem.SetPalette(wxNullPalette);
-    }
-#endif // wxUSE_PALETTE
-
-    return true;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-

src/common/event.cpp

@@ -1462,13 +1462,8 @@ bool wxEvtHandler::DoTryApp(wxEvent& event)
 
 bool wxEvtHandler::TryBefore(wxEvent& event)
 {
-#if WXWIN_COMPATIBILITY_2_8
-    // call the old virtual function to keep the code overriding it working
-    return TryValidator(event);
-#else
     wxUnusedVar(event);
     return false;
-#endif
 }
 
 bool wxEvtHandler::TryAfter(wxEvent& event)
@@ -1491,12 +1486,7 @@ bool wxEvtHandler::TryAfter(wxEvent& event)
     if ( event.WillBeProcessedAgain() )
         return false;
 
-#if WXWIN_COMPATIBILITY_2_8
-    // as above, call the old virtual function for compatibility
-    return TryParent(event);
-#else
     return DoTryApp(event);
-#endif
 }
 
 bool wxEvtHandler::ProcessEvent(wxEvent& event)

src/common/extended.c

@@ -178,16 +178,4 @@ WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
     bytes[9] = loMant;
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
-{
-    return wxConvertFromIeeeExtended(bytes);
-}
-
-WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
-{
-    wxConvertToIeeeExtended(num, bytes);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #endif /* wxUSE_APPLE_IEEE */

src/common/filefn.cpp

@@ -98,10 +98,6 @@ wxDECL_FOR_STRICT_MINGW32(int, _fileno, (FILE*))
 // private globals
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_8
-static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -223,22 +219,6 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const
 // miscellaneous global functions
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_8
-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-
-template<typename CharType>
-static inline CharType* MYcopystring(const CharType* s)
-{
-    CharType* copy = new CharType[wxStrlen(s) + 1];
-    return wxStrcpy(copy, s);
-}
-#endif
-
-
 bool
 wxFileExists (const wxString& filename)
 {
@@ -267,371 +247,6 @@ wxIsAbsolutePath (const wxString& filename)
     return false ;
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-/*
- * Strip off any extension (dot something) from end of file,
- * IF one exists. Inserts zero into buffer.
- *
- */
-
-template<typename T>
-static void wxDoStripExtension(T *buffer)
-{
-    int len = wxStrlen(buffer);
-    int i = len-1;
-    while (i > 0)
-    {
-        if (buffer[i] == wxT('.'))
-        {
-            buffer[i] = 0;
-            break;
-        }
-        i --;
-    }
-}
-
-void wxStripExtension(char *buffer) { wxDoStripExtension(buffer); }
-void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); }
-
-void wxStripExtension(wxString& buffer)
-{
-   buffer = wxFileName::StripExtension(buffer);
-}
-
-// Destructive removal of /./ and /../ stuff
-template<typename CharType>
-static CharType *wxDoRealPath (CharType *path)
-{
-  static const CharType SEP = wxFILE_SEP_PATH;
-#ifdef __WINDOWS__
-  wxUnix2DosFilename(path);
-#endif
-  if (path[0] && path[1]) {
-    /* MATTHEW: special case "/./x" */
-    CharType *p;
-    if (path[2] == SEP && path[1] == wxT('.'))
-      p = &path[0];
-    else
-      p = &path[2];
-    for (; *p; p++)
-      {
-        if (*p == SEP)
-          {
-            if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
-              {
-                CharType *q;
-                for (q = p - 1; q >= path && *q != SEP; q--)
-                {
-                    // Empty
-                }
-
-                if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
-                    && (q - 1 <= path || q[-1] != SEP))
-                  {
-                    wxStrcpy (q, p + 3);
-                    if (path[0] == wxT('\0'))
-                      {
-                        path[0] = SEP;
-                        path[1] = wxT('\0');
-                      }
-#if defined(__WINDOWS__)
-                    /* Check that path[2] is NULL! */
-                    else if (path[1] == wxT(':') && !path[2])
-                      {
-                        path[2] = SEP;
-                        path[3] = wxT('\0');
-                      }
-#endif
-                    p = q - 1;
-                  }
-              }
-            else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
-              wxStrcpy (p, p + 2);
-          }
-      }
-  }
-  return path;
-}
-
-char *wxRealPath(char *path)
-{
-    return wxDoRealPath(path);
-}
-
-wchar_t *wxRealPath(wchar_t *path)
-{
-    return wxDoRealPath(path);
-}
-
-wxString wxRealPath(const wxString& path)
-{
-    wxChar *buf1=MYcopystring(path);
-    wxChar *buf2=wxRealPath(buf1);
-    wxString buf(buf2);
-    delete [] buf1;
-    return buf;
-}
-
-
-// Must be destroyed
-wxChar *wxCopyAbsolutePath(const wxString& filename)
-{
-    if (filename.empty())
-        return NULL;
-
-    if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
-    {
-        wxString buf = ::wxGetCwd();
-        wxChar ch = buf.Last();
-#ifdef __WINDOWS__
-        if (ch != wxT('\\') && ch != wxT('/'))
-            buf << wxT("\\");
-#else
-        if (ch != wxT('/'))
-            buf << wxT("/");
-#endif
-        buf << wxFileFunctionsBuffer;
-        buf = wxRealPath( buf );
-        return MYcopystring( buf );
-    }
-    return MYcopystring( wxFileFunctionsBuffer );
-}
-
-/*-
- Handles:
-   ~/ => home dir
-   ~user/ => user's home dir
-   If the environment variable a = "foo" and b = "bar" then:
-   Unix:
-        $a        =>        foo
-        $a$b        =>        foobar
-        $a.c        =>        foo.c
-        xxx$a        =>        xxxfoo
-        ${a}!        =>        foo!
-        $(b)!        =>        bar!
-        \$a        =>        \$a
-   MSDOS:
-        $a        ==>        $a
-        $(a)        ==>        foo
-        $(a)$b        ==>        foo$b
-        $(a)$(b)==>        foobar
-        test.$$        ==>        test.$$
- */
-
-/* input name in name, pathname output to buf. */
-
-template<typename CharType>
-static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
-{
-    CharType *d, *s, *nm;
-    CharType        lnm[_MAXPATHLEN];
-    int             q;
-
-    // Some compilers don't like this line.
-//    const CharType    trimchars[] = wxT("\n \t");
-
-    CharType      trimchars[4];
-    trimchars[0] = wxT('\n');
-    trimchars[1] = wxT(' ');
-    trimchars[2] = wxT('\t');
-    trimchars[3] = 0;
-
-    static const CharType SEP = wxFILE_SEP_PATH;
-#ifdef __WINDOWS__
-    //wxUnix2DosFilename(path);
-#endif
-
-    buf[0] = wxT('\0');
-    if (name.empty())
-        return buf;
-    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
-    CharType *nm_tmp = nm;
-
-    /* Skip leading whitespace and cr */
-    while (wxStrchr(trimchars, *nm) != NULL)
-        nm++;
-    /* And strip off trailing whitespace and cr */
-    s = nm + (q = wxStrlen(nm)) - 1;
-    while (q-- && wxStrchr(trimchars, *s) != NULL)
-        *s = wxT('\0');
-
-    s = nm;
-    d = lnm;
-#ifdef __WINDOWS__
-    q = FALSE;
-#else
-    q = nm[0] == wxT('\\') && nm[1] == wxT('~');
-#endif
-
-    /* Expand inline environment variables */
-    while ((*d++ = *s) != 0) {
-#  ifndef __WINDOWS__
-        if (*s == wxT('\\')) {
-            if ((*(d - 1) = *++s)!=0) {
-                s++;
-                continue;
-            } else
-                break;
-        } else
-#  endif
-#ifdef __WINDOWS__
-        if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
-#else
-        if (*s++ == wxT('$'))
-#endif
-        {
-            CharType  *start = d;
-            int     braces = (*s == wxT('{') || *s == wxT('('));
-            CharType  *value;
-            while ((*d++ = *s) != 0)
-                if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
-                    break;
-                else
-                    s++;
-            *--d = 0;
-            value = wxGetenv(braces ? start + 1 : start);
-            if (value) {
-                for ((d = start - 1); (*d++ = *value++) != 0;)
-                {
-                    // Empty
-                }
-
-                d--;
-                if (braces && *s)
-                    s++;
-            }
-        }
-    }
-
-    /* Expand ~ and ~user */
-    wxString homepath;
-    nm = lnm;
-    if (nm[0] == wxT('~') && !q)
-    {
-        /* prefix ~ */
-        if (nm[1] == SEP || nm[1] == 0)
-        {        /* ~/filename */
-            homepath = wxGetUserHome(wxEmptyString);
-            if (!homepath.empty()) {
-                s = (CharType*)(const CharType*)homepath.c_str();
-                if (*++nm)
-                    nm++;
-            }
-        } else
-        {                /* ~user/filename */
-            CharType  *nnm;
-            for (s = nm; *s && *s != SEP; s++)
-            {
-                // Empty
-            }
-            int was_sep; /* MATTHEW: Was there a separator, or NULL? */
-            was_sep = (*s == SEP);
-            nnm = *s ? s + 1 : s;
-            *s = 0;
-            homepath = wxGetUserHome(wxString(nm + 1));
-            if (homepath.empty())
-            {
-                if (was_sep) /* replace only if it was there: */
-                    *s = SEP;
-                s = NULL;
-            }
-            else
-            {
-                nm = nnm;
-                s = (CharType*)(const CharType*)homepath.c_str();
-            }
-        }
-    }
-
-    d = buf;
-    if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
-        /* Copy home dir */
-        while (wxT('\0') != (*d++ = *s++))
-          /* loop */;
-        // Handle root home
-        if (d - 1 > buf && *(d - 2) != SEP)
-          *(d - 1) = SEP;
-    }
-    s = nm;
-    while ((*d++ = *s++) != 0)
-    {
-        // Empty
-    }
-    delete[] nm_tmp; // clean up alloc
-    /* Now clean up the buffer */
-    return wxRealPath(buf);
-}
-
-char *wxExpandPath(char *buf, const wxString& name)
-{
-    return wxDoExpandPath(buf, name);
-}
-
-wchar_t *wxExpandPath(wchar_t *buf, const wxString& name)
-{
-    return wxDoExpandPath(buf, name);
-}
-
-
-/* Contract Paths to be build upon an environment variable
-   component:
-
-   example: "/usr/openwin/lib", OPENWINHOME --> ${OPENWINHOME}/lib
-
-   The call wxExpandPath can convert these back!
- */
-wxChar *
-wxContractPath (const wxString& filename,
-                const wxString& envname,
-                const wxString& user)
-{
-  static wxChar dest[_MAXPATHLEN];
-
-  if (filename.empty())
-    return NULL;
-
-  wxStrcpy (dest, filename);
-#ifdef __WINDOWS__
-  wxUnix2DosFilename(dest);
-#endif
-
-  // Handle environment
-  wxString val;
-  wxChar *tcp;
-  if (!envname.empty() && !(val = wxGetenv (envname)).empty() &&
-     (tcp = wxStrstr (dest, val)) != NULL)
-    {
-        wxStrcpy (wxFileFunctionsBuffer, tcp + val.length());
-        *tcp++ = wxT('$');
-        *tcp++ = wxT('{');
-        wxStrcpy (tcp, envname);
-        wxStrcat (tcp, wxT("}"));
-        wxStrcat (tcp, wxFileFunctionsBuffer);
-    }
-
-  // Handle User's home (ignore root homes!)
-  val = wxGetUserHome (user);
-  if (val.empty())
-    return dest;
-
-  const size_t len = val.length();
-  if (len <= 2)
-    return dest;
-
-  if (wxStrncmp(dest, val, len) == 0)
-  {
-    wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
-    if (!user.empty())
-           wxStrcat(wxFileFunctionsBuffer, user);
-    wxStrcat(wxFileFunctionsBuffer, dest + len);
-    wxStrcpy (dest, wxFileFunctionsBuffer);
-  }
-
-  return dest;
-}
-
-#endif // #if WXWIN_COMPATIBILITY_2_8
-
 // Return just the filename, not the path (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {
@@ -763,52 +378,6 @@ CFURLRef wxOSXCreateURLFromFileSystemPath( const wxString& path)
 #endif // __WXMAC__
 
 
-#if WXWIN_COMPATIBILITY_2_8
-
-template<typename T>
-static void wxDoDos2UnixFilename(T *s)
-{
-  if (s)
-    while (*s)
-      {
-        if (*s == wxT('\\'))
-          *s = wxT('/');
-#ifdef __WINDOWS__
-        else
-          *s = wxTolower(*s);        // Case INDEPENDENT
-#endif
-        s++;
-      }
-}
-
-void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
-void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
-
-template<typename T>
-static void
-#if defined(__WINDOWS__)
-wxDoUnix2DosFilename(T *s)
-#else
-wxDoUnix2DosFilename(T *WXUNUSED(s) )
-#endif
-{
-// Yes, I really mean this to happen under DOS only! JACS
-#if defined(__WINDOWS__)
-  if (s)
-    while (*s)
-      {
-        if (*s == wxT('/'))
-          *s = wxT('\\');
-        s++;
-      }
-#endif
-}
-
-void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
-void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
-
-#endif // #if WXWIN_COMPATIBILITY_2_8
-
 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
@@ -1097,38 +666,6 @@ bool wxDirExists(const wxString& pathName)
     return wxFileName::DirExists(pathName);
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-
-// Get a temporary filename, opening and closing the file.
-wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
-{
-    wxString filename;
-    if ( !wxGetTempFileName(prefix, filename) )
-        return NULL;
-
-    if ( buf )
-        wxStrcpy(buf, filename);
-    else
-        buf = MYcopystring(filename);
-
-    return buf;
-}
-
-bool wxGetTempFileName(const wxString& prefix, wxString& buf)
-{
-#if wxUSE_FILE
-    buf = wxFileName::CreateTempFileName(prefix);
-
-    return !buf.empty();
-#else // !wxUSE_FILE
-    wxUnusedVar(prefix);
-    wxUnusedVar(buf);
-
-    return false;
-#endif // wxUSE_FILE/!wxUSE_FILE
-}
-
-#endif // #if WXWIN_COMPATIBILITY_2_8
 
 // Get first file name matching given wild card.
 
@@ -1349,16 +886,6 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
     return false;
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
-                             wxString *pstrPath,
-                             wxString *pstrName,
-                             wxString *pstrExt)
-{
-    wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
-}
-#endif  // #if WXWIN_COMPATIBILITY_2_8
-
 #if wxUSE_DATETIME
 
 time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)

src/common/glcmn.cpp

@@ -67,10 +67,6 @@ void wxGLAttribsBase::AddAttribBits(int searchVal, int combineVal)
 
 wxGLCanvasBase::wxGLCanvasBase()
 {
-#if WXWIN_COMPATIBILITY_2_8
-    m_glContext = NULL;
-#endif
-
     // we always paint background entirely ourselves so prevent wx from erasing
     // it to avoid flicker
     SetBackgroundStyle(wxBG_STYLE_PAINT);
@@ -121,30 +117,8 @@ bool wxGLCanvasBase::SetColour(const wxString& colour)
 
 wxGLCanvasBase::~wxGLCanvasBase()
 {
-#if WXWIN_COMPATIBILITY_2_8
-    delete m_glContext;
-#endif // WXWIN_COMPATIBILITY_2_8
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-
-wxGLContext *wxGLCanvasBase::GetContext() const
-{
-    return m_glContext;
-}
-
-void wxGLCanvasBase::SetCurrent()
-{
-    if ( m_glContext )
-        SetCurrent(*m_glContext);
-}
-
-void wxGLCanvasBase::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 /* static */
 bool wxGLCanvasBase::IsExtensionInList(const char *list, const char *extension)
 {

src/common/intl.cpp

@@ -254,16 +254,8 @@ bool wxLocale::Init(const wxString& name,
                     const wxString& shortName,
                     const wxString& locale,
                     bool            bLoadDefault
-#if WXWIN_COMPATIBILITY_2_8
-                   ,bool            WXUNUSED_UNLESS_DEBUG(bConvertEncoding)
-#endif
                     )
 {
-#if WXWIN_COMPATIBILITY_2_8
-    wxASSERT_MSG( bConvertEncoding,
-                  wxS("wxLocale::Init with bConvertEncoding=false is no longer supported, add charset to your catalogs") );
-#endif
-
     wxString strName(name);
     wxString strShort(shortName);
 
@@ -415,11 +407,6 @@ bool wxLocale::DoCommonPostInit(bool success,
 
 bool wxLocale::Init(int lang, int flags)
 {
-#if WXWIN_COMPATIBILITY_2_8
-    wxASSERT_MSG( !(flags & wxLOCALE_CONV_ENCODING),
-                  wxS("wxLOCALE_CONV_ENCODING is no longer supported, add charset to your catalogs") );
-#endif
-
     wxCHECK_MSG( lang != wxLANGUAGE_UNKNOWN, false,
                  wxS("Initializing unknown locale doesn't make sense, did you ")
                  wxS("mean to use wxLANGUAGE_DEFAULT perhaps?") );

src/common/log.cpp

@@ -458,18 +458,7 @@ void wxLog::DoLogRecord(wxLogLevel level,
                              const wxString& msg,
                              const wxLogRecordInfo& info)
 {
-#if WXWIN_COMPATIBILITY_2_8
-    // call the old DoLog() to ensure that existing custom log classes still
-    // work
-    //
-    // as the user code could have defined it as either taking "const char *"
-    // (in ANSI build) or "const wxChar *" (in ANSI/Unicode), we have no choice
-    // but to call both of them
-    DoLog(level, (const char*)msg.mb_str(), info.timestamp);
-    DoLog(level, (const wchar_t*)msg.wc_str(), info.timestamp);
-#else // !WXWIN_COMPATIBILITY_2_8
     wxUnusedVar(info);
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
 
     // Use wxLogFormatter to format the message
     DoLogTextAtLevel(level, m_formatter->Format (level, msg, info));
@@ -492,27 +481,9 @@ void wxLog::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
 
 void wxLog::DoLogText(const wxString& WXUNUSED(msg))
 {
-    // in 2.8-compatible build the derived class might override DoLog() or
-    // DoLogString() instead so we can't have this assert there
-#if !WXWIN_COMPATIBILITY_2_8
     wxFAIL_MSG( "must be overridden if it is called" );
-#endif // WXWIN_COMPATIBILITY_2_8
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-
-void wxLog::DoLog(wxLogLevel WXUNUSED(level), const char *szString, time_t t)
-{
-    DoLogString(szString, t);
-}
-
-void wxLog::DoLog(wxLogLevel WXUNUSED(level), const wchar_t *wzString, time_t t)
-{
-    DoLogString(wzString, t);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // wxLog active target management
 // ----------------------------------------------------------------------------
@@ -1039,10 +1010,6 @@ size_t          wxLog::ms_suspendCount = 0;
 
 wxString        wxLog::ms_timestamp(wxS("%X"));  // time only, no date
 
-#if WXWIN_COMPATIBILITY_2_8
-wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
-#endif // wxDEBUG_LEVEL
-
 // ----------------------------------------------------------------------------
 // stdout error logging helper
 // ----------------------------------------------------------------------------

src/common/menucmn.cpp

@@ -337,13 +337,6 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text)
     return wxStripMenuCodes(text, wxStrip_Menu);
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
-{
-    return GetLabelText(text);
-}
-#endif
-
 void wxMenuItemBase::SetBitmap(const wxBitmapBundle& bmp)
 {
     m_bitmap = bmp;
@@ -1152,19 +1145,6 @@ void wxMenuBarBase::UpdateMenus()
     }
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-// get or change the label of the menu at given position
-void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label)
-{
-    SetMenuLabel(pos, label);
-}
-
-wxString wxMenuBarBase::GetLabelTop(size_t pos) const
-{
-    return GetMenuLabelText(pos);
-}
-#endif
-
 #endif // wxUSE_MENUBAR
 
 #endif // wxUSE_MENUS

src/common/sizer.cpp

@@ -1199,13 +1199,6 @@ void wxSizer::SetSizeHints( wxWindow *window )
                                           this);
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-void wxSizer::SetVirtualSizeHints( wxWindow *window )
-{
-    FitInside( window );
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // TODO on mac we need a function that determines how much free space this
 // min size contains, in order to make sure that we have 20 pixels of free
 // space around the controls

src/common/string.cpp

@@ -558,25 +558,6 @@ bool wxString::Shrink()
   return true;
 }
 
-// deprecated compatibility code:
-#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-wxStringCharType *wxString::GetWriteBuf(size_t nLen)
-{
-    return DoGetWriteBuf(nLen);
-}
-
-void wxString::UngetWriteBuf()
-{
-    DoUngetWriteBuf();
-}
-
-void wxString::UngetWriteBuf(size_t nLen)
-{
-    DoUngetWriteBuf(nLen);
-}
-#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-
-
 // ---------------------------------------------------------------------------
 // data access
 // ---------------------------------------------------------------------------

src/common/tbarbase.cpp

@@ -28,9 +28,6 @@
     #include "wx/control.h"
     #include "wx/frame.h"
     #include "wx/settings.h"
-    #if WXWIN_COMPATIBILITY_2_8
-        #include "wx/image.h"
-    #endif // WXWIN_COMPATIBILITY_2_8
     #include "wx/menu.h"
     #include "wx/vector.h"
 #endif
@@ -829,18 +826,4 @@ bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
 }
 #endif
 
-#if WXWIN_COMPATIBILITY_2_8
-
-bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
-{
-#if wxUSE_IMAGE
-    out = in.ConvertToGreyscale();
-    if ( out.IsOk() )
-        return true;
-#endif // wxUSE_IMAGE
-    return false;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #endif // wxUSE_TOOLBAR