Bild fixes

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

diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src
index 16ed4638893d17be7b7573fdeed52cc29132b1fb..96ac5653e2e6062af1761fb021a5a598ad1deae5 100755 (executable)
--- a/distrib/gtk/copy_src
+++ b/distrib/gtk/copy_src
@@ -116,6 +116,13 @@ cd ..
 
 cd ..
 
+echo User dir..
+
+cd src
+mkdir ~/wxgtk_dist/wxGTK/user
+cp Makefile ~/wxgtk_dist/wxGTK/user
+cd ..
+
 echo Src dir..
 
 cd src
@@ -366,6 +373,7 @@ cp Makefile.in ~/wxgtk_dist/wxGTK/samples/forty
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/forty
 cp *.h ~/wxgtk_dist/wxGTK/samples/forty
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/forty
+cp *.xbm ~/wxgtk_dist/wxGTK/samples/forty
 cd ..
 
 echo Fractal sample..
@@ -631,6 +639,7 @@ mkdir ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp Makefile ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp *.h ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp wxpoem.dat ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp wxpoem.txt ~/wxgtk_dist/wxGTK/samples/wxpoem

diff --git a/setup/setup.hin b/setup/setup.hin
index 70d7206dd5bf5bf154c807ac7eea90bbf84434b7..eed96dd6e1a9da85387f85aba270cbbb364f859d 100644 (file)
--- a/setup/setup.hin
+++ b/setup/setup.hin
@@ -61,7 +61,7 @@
 #define wxHAVE_GLIBC2 0
 
 //------------------------------------------------------------------------
-// GUI control options (allways enabled in wxGTK)
+// GUI control options (always enabled in wxGTK)
 //------------------------------------------------------------------------
 
 /*
@@ -110,6 +110,10 @@
  * streams implementation.
  */
 #define wxUSE_STD_IOSTREAM  1
+/*
+ * Use constraints mechanism
+ */
+#define wxUSE_CONSTRAINTS 1
 
 //------------------------------------------------------------------------
 // PS options