From beff65bff5fa3739a191bc0c72733167dbc8bb05 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 15 Dec 2007 23:21:43 +0000
Subject: [PATCH] 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
---
 Makefile.in               | 3 +--
 build/bakefiles/files.bkl | 2 +-
 build/msw/makefile.vc     | 4 ++--
 build/msw/wx_adv.dsp      | 4 ----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2eedb2fb09..a5cfcd4668 100644
--- 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 84e0783c3e..692d823f78 100644
--- 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 28715f60e8..cab48b19f1 100644
--- 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 2270e1a672..a3caf9134b 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -812,10 +812,6 @@ SOURCE=..\..\include\wx\animate.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\animdecod.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\bmpcbox.h
 # End Source File
 # Begin Source File
-- 
2.45.2