wx/animdecod.h must be in common headers, not advanced ones

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 2eedb2fb0978c9460feb2a7c14537c31e1bd657a..a5cfcd4668e1bb2f3647cf62e9d7a5a4fd9229b2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2984,7 +2984,6 @@ COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR =  \
 COND_WXUNIV_0_ADVANCED_HDR =  \
        wx/aboutdlg.h \
        wx/animate.h \
-       wx/animdecod.h \
        wx/bmpcbox.h \
        wx/calctrl.h \
        wx/dataview.h \
@@ -3027,7 +3026,6 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
 COND_WXUNIV_1_ADVANCED_HDR =  \
        wx/aboutdlg.h \
        wx/animate.h \
-       wx/animdecod.h \
        wx/bmpcbox.h \
        wx/calctrl.h \
        wx/dataview.h \
@@ -3227,6 +3225,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/accel.h \
        wx/access.h \
        wx/anidecod.h \
+       wx/animdecod.h \
        wx/artprov.h \
        wx/bitmap.h \
        wx/bookctrl.h \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 84e0783c3eaa99d15444c29a92b434b68cb76f17..692d823f78b1fdf3a993a6bc314924fafc5eb67f 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -840,6 +840,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/accel.h
     wx/access.h
     wx/anidecod.h
+    wx/animdecod.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h
@@ -2803,7 +2804,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/aboutdlg.h
     wx/animate.h
-    wx/animdecod.h
     wx/bmpcbox.h
     wx/calctrl.h
     wx/dataview.h

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 28715f60e836ea52fe66b3d4b60f61d2bcb15948..cab48b19f165581b4a1bd2568080cf41f67f26c3 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -4495,7 +4495,7 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
 
@@ -4814,7 +4814,7 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
 sub_samples: 
        cd ..\..\samples
        $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 
 $(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)

diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 2270e1a672f94c025bd8a41d02ac2abae1609d0f..a3caf9134bac3fa472acfa92c97df5fc63deed42 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -812,10 +812,6 @@ SOURCE=..\..\include\wx\animate.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\animdecod.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\include\wx\bmpcbox.h\r
 # End Source File\r
 # Begin Source File\r