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

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

Makefile.in

@@ -65,7 +65,7 @@ HOST_SUFFIX = @HOST_SUFFIX@
 DESTDIR = 
 WX_RELEASE = 2.6
 WX_RELEASE_NODOT = 26
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(____SHARED) $(CPPFLAGS) $(CFLAGS)
 WXREGEX_OBJECTS =  \
@@ -24205,6 +24205,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/xml
 	mkdir $(DISTDIR)/include/wx/xrc
 	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
@@ -24384,6 +24385,7 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.rc $(DISTDIR)/src/msw
+	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
@@ -24401,6 +24403,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/msw/wince
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
+	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
 	cp $(SRCDIR)/*.??? $(DISTDIR)/src
@@ -24520,9 +24523,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls
-	cp $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
 
@@ -24685,34 +24685,22 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
 
 	mkdir $(DISTDIR)/samples/internat
-	mkdir $(DISTDIR)/samples/internat/bg
-	mkdir $(DISTDIR)/samples/internat/cs
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
-	mkdir $(DISTDIR)/samples/internat/ja
+	mkdir $(DISTDIR)/samples/internat/ju
-	mkdir $(DISTDIR)/samples/internat/ka
-	mkdir $(DISTDIR)/samples/internat/pl
 	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
-	cp $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg
-	cp $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs
-	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja
-	cp $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka
-	cp $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl
 	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
-	cp $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg
-	cp $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs
-	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja
-	cp $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka
-	cp $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl
 	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
@@ -24850,6 +24838,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
 #	mkdir $(DISTDIR)/samples/resource
 #	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
@@ -25203,7 +25192,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
 			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
 			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-			   -o -name "*.bkl" -o -name "*.pro"  \
+			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
 			   -o -name "*.vpj" -o -name "*.sc"                      \
 			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
 			\) -print0 | xargs -0 rm -rf

art/cdrom.xpm

@@ -1,57 +1,29 @@
 /* XPM */
 static char *cdrom_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 36 1",
+"16 15 10 1",
-"= c #9BACC2",
+"     s None    c None",
-"y c #547B99",
+".    c #808080",
-"$ c #FFFFFF",
+"X    c #c0c0c0",
-"@ c #839CB5",
+"o    c Yellow",
-"o c #547897",
+"O    c Blue",
-"4 c #4D7492",
+"+    c Black",
-"% c #F1F4F7",
+"@    c Gray100",
-"X c #5A809C",
+"#    c #008080",
-"< c #8497A5",
+"$    c Green",
-"0 c #7898AD",
+"%    c #008000",
-"+ c #CAD2DC",
+"        ...     ",
-"r c #ACAEB2",
+"      ..XoX..   ",
-"2 c #BECAD9",
+"     .O.XoXXX+  ",
-"* c #65839D",
+"    ...O.oXXXX+ ",
-"e c #DCE2EA",
+"    .O..X.XXXX+ ",
-"- c #ADBED2",
+"   ....X.+..XXX+",
-"t c #597B9A",
+"   .XXX.+@+.XXX+",
-"  c None",
+"   .X@XX.+.X@@X+",
-"1 c #467291",
+" .....X...#XX@+ ",
-"9 c #D6DFE7",
+".@@@...XXo.O@X+ ",
-"O c #7393AB",
+".@XXX..XXoXOO+  ",
-"u c #49708B",
+".@++++..XoX+++  ",
-"5 c #A0BACB",
+".@$%@@XX+++X.+  ",
-"& c #AABFCD",
+".............+  ",
-"8 c #B9CBD5",
+" ++++++++++++   "};
-"; c #B4C4D3",
-": c #6F90A6",
-"3 c #A8B6CA",
-"# c #ADBACE",
-"w c #E4E9ED",
-". c #8EA9BC",
-"> c #B3BFD1",
-", c #C2CBDB",
-"6 c #C0D1DC",
-"7 c #A2B3C5",
-"q c #5D7C93",
-/* pixels */
-"     .XooOo+    ",
-"    X@#$$$%o&   ",
-"   *=-;$$$$$o+  ",
-"  +O#;-$$$$$$:  ",
-"  o=>,-<1<$2-o  ",
-"  o3>--1$122-*  ",
-"  o=--$<4<22-X  ",
-"  o5$$$$$26;7*  ",
-"   X%$$$$2;-X8  ",
-"  90*9$$$-7Xqo  ",
-" wXwe@O44X4<r<o ",
-" X8628>22222<<*4",
-" ttyyyoo4441uuuo",
-" t>$$$$$$$$$$$>o",
-" XXXtyyyoo44411u"
-};

art/copy.xpm

@@ -1,44 +1,26 @@
 /* XPM */
 static char *copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 16 4 1",
-"o c #97C4E7",
+". c Black",
-"* c #FFFFFF",
+"X c #FFFFFF",
-"@ c #60A9DA",
+"o c #000080",
-"= c #D1E5F5",
-"& c #C3DDF1",
-". c #7EA6C0",
 "  c None",
-"X c #2F93CD",
-"O c #85BBE2",
-", c #EFF6FC",
-"; c #DEEDF8",
-"+ c #72B2DD",
-"3 c #F7FBFD",
-"4 c #FAFCFE",
-": c #DAEAF7",
-"< c #E9F3FA",
-"1 c #E2EFF8",
-"- c #FDFDFE",
-"% c #B6D5EE",
-"$ c #A5CCEA",
-"> c #E5F0F9",
-"# c #AFD1EC",
-"2 c #F4F9FD",
 /* pixels */
-" .....XX        ",
+"                ",
-" .oO+@X#X       ",
+"......          ",
-" .$oO+X##X      ",
+".XXXX..         ",
-" .%$o........   ",
+".XXXX.X.        ",
-" .&%$.*=&#o.-.  ",
+".X..X.oooooo    ",
-" .=&%.*;=&#.--. ",
+".XXXXXoXXXXoo   ",
-" .:=&.*>;=&.... ",
+".X....oXXXXoXo  ",
-" .>:=.*,>;=&#o. ",
+".XXXXXoX..Xoooo ",
-" .<1:.*2,>:=&#. ",
+".X....oXXXXXXXo ",
-" .2<1.*32,>:=&. ",
+".XXXXXoX.....Xo ",
-" .32<.*432,>:=. ",
+"......oXXXXXXXo ",
-" .32<.*-432,>:. ",
+"      oX.....Xo ",
-" .....**-432,>. ",
+"      oXXXXXXXo ",
-"     .***-432,. ",
+"      ooooooooo ",
-"     .......... "
+"                ",
+"                "
 };

art/cut.xpm

@@ -1,46 +1,25 @@
 /* XPM */
 static char *cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 25 1",
+"16 16 3 1",
-"6 c #D8BDC0",
+". c Black",
-": c #C3C3C4",
+"X c #000080",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
 "  c None",
-"* c #DFE0E2",
-"5 c #B69596",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
 /* pixels */
-"   .X     .o    ",
+"                ",
-"   O.+   @.     ",
+"     .   .      ",
-"    O.   ..     ",
+"     .   .      ",
-"    O#$ %.&     ",
+"     .   .      ",
-"     O.*..      ",
+"     .. ..      ",
-"     #%#..      ",
+"      . .       ",
-"     O=-..      ",
+"      ...       ",
-"     #%#;.      ",
+"       .        ",
-"     OO:=O      ",
+"      X.X       ",
-"  >,,<, ,<,,1   ",
+"      X XXX     ",
-" ><23<1 1<32<1  ",
+"    XXX X  X    ",
-" ,2 4<   <5 2,  ",
+"   X  X X  X    ",
-" <, ,2   2, ,<  ",
+"   X  X X  X    ",
-" 23,<5   5<,32  ",
+"   X  X  XX     ",
-" 6225     522>  "
+"    XX          ",
+"                "
 };

art/deffile.xpm

@@ -1,54 +1,83 @@
 /* XPM */
 static char *deffile_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 16 32 1",
+"16 16 61 1",
-"= c #97C4E7",
+"% c #E8E8EC",
-": c #72A8D2",
+"k c #D9D9E0",
-"1 c #FFFFFF",
+"= c #E8E8ED",
-"w c #839CB5",
+"V c #CACAD4",
-"X c #6B98B8",
+"8 c #D9D9E1",
-". c #5A89A6",
+"h c #D2D2DA",
-"@ c #3A749C",
+"y c #E1E1E7",
-", c #D1E5F5",
+"l c #D2D2DB",
-"< c #67A1CF",
+"< c #E9E9ED",
-"> c #F1F4F7",
+"t c #E9E9EE",
-"e c #85A7BC",
+"e c #DADAE1",
-"% c #C3DDF1",
+"x c #E2E2E7",
-"0 c #749BB4",
+"+ c #F1F1F4",
-"2 c #7EA6C0",
+"m c #D3D3DB",
-"; c #5F9BC8",
+"1 c #E2E2E8",
+"C c #D3D3DC",
+"$ c #EAEAEE",
+"4 c #DBDBE2",
+"M c #CCCCD6",
+"q c #E3E3E8",
+"f c #D4D4DC",
+"a c #E3E3E9",
+"v c #D4D4DD",
+"7 c #DCDCE2",
+": c #EBEBEF",
+"w c #DCDCE3",
 "  c None",
-"O c #538DB3",
+"O c #F3F3F5",
-"- c #85BBE2",
+"> c #E4E4E9",
-"$ c #D6DFE7",
+"& c #F3F3F6",
-"9 c #EFF6FC",
+"n c #D5D5DD",
-"o c #6591AE",
+"6 c #E4E4EA",
-"4 c #F7FBFD",
+". c #C6C6D5",
-"8 c #FAFCFE",
+"g c #DDDDE3",
-"6 c #DAEAF7",
+"# c #ECECF0",
-"7 c #E9F3FA",
+"b c #CECED7",
-"q c #FDFDFE",
+"j c #DDDDE4",
-"3 c #E2EFF8",
+"B c #CECED8",
-"# c #8EA9BC",
+"0 c #E5E5EA",
-"& c #B6D5EE",
+"p c #D6D6DE",
-"* c #A5CCEA",
+"; c #EDEDF0",
-"5 c #F4F9FD",
+"3 c #DEDEE4",
-"+ c #4581AA",
+", c #EDEDF1",
+"Z c #CFCFD8",
+"u c #DEDEE5",
+"o c #F5F5F7",
+"c c #D7D7DE",
+"- c #E6E6EB",
+"r c #D7D7DF",
+"A c #C8C8D3",
+"s c #DFDFE5",
+"@ c #EEEEF2",
+"z c #D0D0D9",
+"X c #9494AD",
+"5 c #E7E7EB",
+"i c #D8D8DF",
+"9 c #E7E7EC",
+"d c #D8D8E0",
+"* c #EFEFF2",
+"2 c #E0E0E6",
+"N c #D1D1DA",
 /* pixels */
-"  ..XooO+@#$    ",
+"  ........X     ",
-"  .%%&*=-;:;>   ",
+"  .oO+@#$%XX    ",
-"  .,,%&*=<1=X>  ",
+"  .&+*#$=-XXX   ",
-"  #%%%%&*211=X  ",
+"  .+*;:=->XXXX  ",
-"  #3-----<oXoO  ",
+"  .*,:<->1234X  ",
-"  #3456,%&*=-O  ",
+"  .,:<5612378X  ",
-"  #3--------=O  ",
+"  .:<90q23werX  ",
-"  #355736,%&*o  ",
+"  .t90qyuweipX  ",
-"  #3--------&o  ",
+"  .90ayswedpfX  ",
-"  #38459736,%X  ",
+"  .-aysg4dpfhX  ",
-"  #3--------,0  ",
+"  .>ysj4kpflzX  ",
-"  #31q84597360  ",
+"  .xsj4kcvlzbX  ",
-"  #3--------3w  ",
+"  .234krnmzbMX  ",
-"  #3111q84597e  ",
+"  .378rnmNBMVX  ",
-"  ##########e#  ",
+"  .wernCNZMVAX  ",
-"                "
+"  XXXXXXXXXXXX  "
 };

art/delete.xpm

@@ -1,42 +1,24 @@
 /* XPM */
 static char *delete_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 21 1",
+"16 16 2 1",
-"2 c #A5AEBD",
+". c Black",
-"* c #5478B4",
-"< c #95A3BB",
-"O c #9AA7BC",
-"; c #758EB7",
-"$ c #6986B6",
-"# c #4971B2",
-"& c #8A9CBA",
-"X c #8598B9",
 "  c None",
-"o c #ABB2BE",
-"- c #7F95B9",
-"= c #4E74B3",
-"1 c #A0ABBC",
-"+ c #6F8AB7",
-". c #B5B9BF",
-"@ c #3E69B1",
-", c #90A0BA",
-": c #6483B5",
-"> c #5A7BB4",
-"% c #5F7FB5",
 /* pixels */
 "                ",
-"    .Xo      OO ",
+"  ...         . ",
-"    +@#.    $@% ",
+"  ....      ..  ",
-"    &@@X  .*@*o ",
+"   ....    ..   ",
-"     =@= .*@*.  ",
+"     ...  ..    ",
-"     -@@X*@*.   ",
+"      .....     ",
-"     .#@@@$.    ",
+"       ...      ",
-"      ;@@:      ",
+"      .....     ",
-"     ;@@@+      ",
+"     ...  ..    ",
-"   .>@#%@@.     ",
+"    ...    ..   ",
-"  o*@*oO@@,     ",
+"   ...      .   ",
-" <#@*. .@@=     ",
+"  ....       .  ",
-"&@@$    :@@1    ",
+"  ...           ",
-";#&     2#>.    ",
+"   .          . ",
+"                ",
 "                "
 };

art/dir_up.xpm

@@ -1,52 +1,24 @@
 /* XPM */
 static char *dir_up_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 31 1",
+"16 15 4 1",
-"6 c #9BACC2",
+"@ c #000000",
-"o c #9AEA53",
-"7 c #94A5BD",
-"8 c #547897",
-"5 c #839CB5",
-"@ c #376485",
-"$ c #5A809C",
-"# c #7F99B4",
-": c #D1D9E5",
-"< c #EAEDF3",
-"& c #446A8C",
-"q c #65839D",
-"> c #DCE2EA",
-", c #E1E6EE",
-"2 c #F5F6F7",
-"O c #8DA0B9",
 "  c None",
-"% c #467291",
+"* c Yellow",
-". c #305F81",
+": c Gray100",
-"X c #7393AB",
-"+ c #6A89A2",
-"4 c #A8B6CA",
-"1 c #EEF1F3",
-"3 c #F8F9FA",
-"0 c #215579",
-"9 c #7F97B0",
-"* c #B3BFD1",
-"w c #7A90AC",
-"- c #C2CBDB",
-"; c #CAD6E1",
-"= c #BBC4D6",
 /* pixels */
-"         ..     ",
+"                ",
-"        X.o.    ",
+"   @@@@@        ",
-"....   X.ooo.   ",
+"  @*:*:*@       ",
-".OO+....ooooo.  ",
+" @@@@@@@@@@@@@@ ",
-".OOOOOO@@ooo..  ",
+" @:*:*:*:*:*:*:@",
-".OOOO#OO@ooo.$  ",
+" @*:*:@:*:*:*:*@",
-".OOOOOOO@ooo.$  ",
+" @:*:@@@:*:*:*:@",
-".O%............&",
+" @*:@@@@@:*:*:*@",
-".O&*=-;:>,<1231.",
+" @:*:*@*:*:*:*:@",
-".+.4*=-;:>,<12$.",
+" @*:*:@:*:*:*:*@",
-"..564*=-;:>,<1. ",
+" @:*:*@@@@@@:*:@",
-".@O764*=-;:>,<. ",
+" @*:*:*:*:*:*:*@",
-".89O764*=-;:>$$ ",
+" @:*:*:*:*:*:*:@",
-"0qw9O764*=-;:.  ",
+" @@@@@@@@@@@@@@@",
-"0.............  "
+"                "};
-};

art/fileopen.xpm

@@ -1,57 +1,25 @@
 /* XPM */
 static char *fileopen_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 36 1",
+"16 15 5 1",
-"6 c #9BACC2",
-"< c #9AEA53",
-"9 c #94A5BD",
-"5 c #839CB5",
-"; c #4D7492",
-". c #376485",
-"$ c #7F99B4",
-"r c #D1D9E5",
-"7 c #EAEDF3",
-"@ c #CAD2DC",
-"% c #718BA7",
-"t c #BECAD9",
-"& c #65839D",
-"0 c #DCE2EA",
-"4 c #F5F6F7",
-"w c #597B9A",
-"O c #8DA0B9",
 "  c None",
-"+ c #467291",
+". c Black",
-"u c #305F81",
+"X c Yellow",
-"= c #B4C4D3",
+"o c Gray100",
-"# c #CAE2AA",
+"O c #bfbf00",
-"1 c #FAFCFE",
-"3 c #A8B6CA",
-"q c #E4E9ED",
-"8 c #EEF1F3",
-"X c #215579",
-"2 c #7F97B0",
-": c #B3BFD1",
-"y c #7A90AC",
-", c #C2CBDB",
-"- c #ADD668",
-"* c #B6D791",
-"e c #CAD6E1",
-"o c #DFF0D0",
-"> c #BBC4D6",
 /* pixels */
 "                ",
-"     ....       ",
+"          ...   ",
-"XXXXX .oo.      ",
+"         .   . .",
-"XOOOO+@.#o.     ",
+"              ..",
-"XOOOO$%&.*oXXX  ",
+"  ...        ...",
-"XOOOOOOO.*oX=X  ",
+" .XoX.......    ",
-"XOXXXX...-oXXXX;",
+" .oXoXoXoXo.    ",
-"XOX:>,.<<<<<oX1;",
+" .XoXoXoXoX.    ",
-"X2X3:>,.<<<oX4=;",
+" .oXoX..........",
-"XX563:>>.<oX78; ",
+" .XoX.OOOOOOOOO.",
-"XXO963:>>.X0q7; ",
+" .oo.OOOOOOOOO. ",
-"Xw2O963:>>er0t; ",
+" .X.OOOOOOOOO.  ",
-"X&y2O963:>,er;  ",
+" ..OOOOOOOOO.   ",
-"uXXXXXXXXXXXX;  ",
+" ...........    ",
-"                "
+"                "};
-};

art/filesave.xpm

@@ -1,42 +1,25 @@
 /* XPM */
 static char *filesave_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 21 1",
+"16 16 3 1",
-"O c #FFFFFF",
+". c Black",
-"> c #D5D6D8",
+"X c #808000",
-"; c #446A8C",
+"  c None",
-"1 c #CAD2DC",
-": c #C0C7D1",
-"  c #5F666D",
-"% c #A5B0BA",
-"o c #65839D",
-", c #DCE2EA",
-"< c #C3C5C8",
-"- c #E1E6EE",
-"* c #C6CCD3",
-". c None",
-"$ c #305F81",
-"2 c #D6DFE7",
-"= c #D2D9E0",
-"& c #B7BFC7",
-"X c #1B4467",
-"# c #BCBDBE",
-"@ c #7A90AC",
-"+ c #5D7C93",
 /* pixels */
-"               .",
+"                ",
-" XoOOOOOOOOO+X .",
+" .............. ",
-" @oO#######O+@ .",
+" .X.        . . ",
-" @oOOOOOOOOO+@ .",
+" .X.        ... ",
-" @oO#######O+@ .",
+" .X.        .X. ",
-" @oOOOOOOOOO+@ .",
+" .X.        .X. ",
-" @@+++++++++@@ .",
+" .X.        .X. ",
-" @@@@@@@@@@@@@ .",
+" .X.        .X. ",
-" @@@$$$$$$$$@@ .",
+" .XX........XX. ",
-" @@$%%%&*=-O$@ .",
+" .XXXXXXXXXXXX. ",
-" @@$%X;;*=-O$@ .",
+" .XX.........X. ",
-" @@$%X;;:>,O$@ .",
+" .XX......  .X. ",
-" @@$%X;;<12O$@ .",
+" .XX......  .X. ",
-" @@$<<2OOOOO$@ .",
+" .XX......  .X. ",
-".             .."
+"  ............. ",
+"                "
 };

art/filesaveas.xpm

@@ -1,44 +1,25 @@
 /* XPM */
 static char *filesaveas_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 16 3 1",
-"X c Black",
+". c Black",
-"+ c #FFFFFF",
+"X c #808000",
-"< c #D5D6D8",
+"  c None",
-"> c #446A8C",
-"3 c #CAD2DC",
-", c #C0C7D1",
-"  c #5F666D",
-"* c #A5B0BA",
-"O c #65839D",
-"1 c #DCE2EA",
-"2 c #C3C5C8",
-": c #E1E6EE",
-". c #FFFF00",
-"- c #C6CCD3",
-"@ c None",
-"& c #305F81",
-"4 c #D6DFE7",
-"; c #D2D9E0",
-"= c #B7BFC7",
-"o c #1B4467",
-"$ c #BCBDBE",
-"# c #7A90AC",
-"% c #5D7C93",
 /* pixels */
-"         .X .XX.",
+"                ",
-" oO+++++++.X.X.@",
+" .............. ",
-" #O+$$$$$XX...XX",
+" .X.        . . ",
-" #O++++++.......",
+" .X.        ... ",
-" #O+$$$$$XX...XX",
+" .X.        .X. ",
-" #O+++++++.X.X.@",
+" .X.        .X. ",
-" ##%%%%%%.X%.X .",
+" .X.        .X. ",
-" ############# @",
+" .X.        .X. ",
-" ###&&&&&&&&## @",
+" .XX........XX. ",
-" ##&***=-;:+&# @",
+" .XXXXXXXXXXXX. ",
-" ##&*o>>-;:+&# @",
+" .XX.........X. ",
-" ##&*o>>,<1+&# @",
+" .XX......  .X. ",
-" ##&*o>>234+&# @",
+" .XX......  .X. ",
-" ##&224+++++&# @",
+" .XX......  .X. ",
-"@             @@"
+"  ............. ",
+"                "
 };

art/find.xpm

@@ -1,62 +1,25 @@
 /* XPM */
 static char *find_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 41 1",
+"16 16 3 1",
-"y c #A06959",
+". c Black",
-"9 c #A7DAF2",
+"X c #FFFFFF",
-"$ c #B5CAD7",
-"> c #35B4E1",
-"t c #6B98B8",
-"w c #B6E0F4",
-"q c #AEC9D7",
-"1 c #5A89A6",
-"+ c #98B3C6",
-"4 c #EAF6FC",
-"3 c #DEF1FA",
-"= c #4CBCE3",
-"d c #DB916B",
-"X c #85A7BC",
-"s c #D8BCA4",
-"o c #749BB4",
-"e c #BCD9EF",
-"* c #62B4DD",
-"< c #91D2EF",
-"a c #E6DED2",
-"0 c #E9F4FB",
 "  c None",
-"@ c #A0BACB",
-"O c #AABFCD",
-"i c #6591AE",
-": c #B9CBD5",
-"- c #71C5E7",
-"5 c #D3ECF8",
-"% c #81A3B9",
-"6 c #8AD0EE",
-"8 c #FDFDFE",
-"p c #8EA9BC",
-"r c #B6D5EE",
-", c #81CCEB",
-". c #ACC4D3",
-"; c #AFD1DE",
-"7 c #EFF8FC",
-"u c #C2CBDB",
-"# c #C0D1DC",
-"2 c #CAD6E1",
-"& c #8FB0C3",
 /* pixels */
-"       .XooXO   ",
+"                ",
-"      +@###$+%  ",
+"   ...   ...    ",
-"     .&#*==-;@@ ",
+"   .X.   .X.    ",
-"     o:*>,<--:X ",
+"   ...   ...    ",
-"     12>-345-#% ",
+"  ..... .....   ",
-"     12>678392% ",
+"  .X... .X...   ",
-"     %$*,3059q& ",
+" .............  ",
-"     @Oq,wwer@@ ",
+"..X... ..X..... ",
-"      t@q22q&+  ",
+"..X... ..X..... ",
-"    yyui+%o%p   ",
+"..X......X..... ",
-"   yasy         ",
+"....... ....... ",
-"  yasdy         ",
+".X...     .X... ",
-" yasdy          ",
+".X...     .X... ",
-" ysdy           ",
+".....     ..... ",
-"  yy            "
+"                ",
+"                "
 };

art/findrepl.xpm

@@ -1,63 +1,40 @@
 /* XPM */
 static char *findrepl_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 42 1",
+"32 32 2 1",
-"y c #A06959",
+". c Black",
-"9 c #A7DAF2",
-"$ c #B5CAD7",
-"> c #35B4E1",
-"t c #6B98B8",
-"w c #B6E0F4",
-"q c #AEC9D7",
-"1 c #5A89A6",
-"+ c #98B3C6",
-"4 c #EAF6FC",
-"d c #008000",
-"3 c #DEF1FA",
-"= c #4CBCE3",
-"f c #DB916B",
-"X c #85A7BC",
-"s c #D8BCA4",
-"o c #749BB4",
-"e c #BCD9EF",
-"* c #62B4DD",
-"< c #91D2EF",
-"a c #E6DED2",
-"0 c #E9F4FB",
 "  c None",
-"@ c #A0BACB",
-"O c #AABFCD",
-"i c #6591AE",
-": c #B9CBD5",
-"- c #71C5E7",
-"5 c #D3ECF8",
-"% c #81A3B9",
-"6 c #8AD0EE",
-"8 c #FDFDFE",
-"p c #8EA9BC",
-"r c #B6D5EE",
-", c #81CCEB",
-". c #ACC4D3",
-"; c #AFD1DE",
-"7 c #EFF8FC",
-"u c #C2CBDB",
-"# c #C0D1DC",
-"2 c #CAD6E1",
-"& c #8FB0C3",
 /* pixels */
-"      .XooXO    ",
+"                                ",
-"     +@###$+%   ",
+"                                ",
-"    .&#*==-;@@  ",
+"                                ",
-"    o:*>,<--:X  ",
+"                                ",
-"    12>-345-#%  ",
+"                                ",
-"    12>678392%  ",
+"                                ",
-"    %$*,3059q&  ",
+"           ....   ...           ",
-"    @Oq,wwer@@  ",
+"           .   . .   .          ",
-"     t@q22q&+   ",
+"           .   . .   .          ",
-"   yyui+%o%p    ",
+"           .   . .   .          ",
-"  yasy   d   d  ",
+"           .   . .   .          ",
-" yasfy  dd   dd ",
+"           .   .  ...           ",
-"yasfy  ddddddddd",
+"                                ",
-"ysfy    dd   dd ",
+"                                ",
-" yy      d   d  "
+"                                ",
+"                                ",
+"                                ",
+"       .                        ",
+"                                ",
+"       .  ...  ...  ....        ",
+"       . .    .   . .   .       ",
+"       . .    .   . .   .       ",
+"       . .    .   . .   .       ",
+"       . .    .   . .   .       ",
+"       .  ...  ...  .   .       ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
 };

art/floppy.xpm

@@ -1,39 +1,26 @@
 /* XPM */
 static char *floppy_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 18 1",
+"16 15 7 1",
-"& c #E3E4E6",
+"     s None    c None",
-"+ c #FFFFFF",
+".    c #808080",
-". c #446A8C",
+"X    c Gray100",
-"o c #697787",
+"o    c #c0c0c0",
-"> c #5F666D",
+"O    c Black",
-"* c #B2B3B3",
+"+    c Cyan",
-"  c None",
+"@    c Red",
-", c #4B4C4D",
+"         ......X",
-"= c #DCDBDA",
+"        .ooooooO",
-"$ c #1B4467",
+"        .+++++OO",
-": c #E4E9ED",
+"        .++++++O",
-"@ c #979BA0",
+"        .++++++O",
-"X c #203646",
+"        .ooooooO",
-"O c #215579",
+"  .......o....oO",
-"- c #545B63",
+" .oooooo.o.O.XoO",
-"; c #636465",
+".XXXXXXXXOOOOOO ",
-"# c #CAD6E1",
+".ooooooooo@o..O ",
-"% c #7F8286",
+".ooo....oooo..O ",
-/* pixels */
+".o..OOOO...o..O ",
-"  .XoooooooXO   ",
+".oooXXXXoooo..O ",
-"  .o+++++++.O   ",
+".............O  ",
-"  .o+OOOOO+.O   ",
+" OOOOOOOOOOOO   "};
-"  .o+++++++.O   ",
-"  .o@@@@@@@.O   ",
-"  ..........O   ",
-"  ..#+++++#.O   ",
-"  ..+$O+++#.O   ",
-"  ..+$O+++#.O   ",
-" %&.........*%  ",
-"%=+++++++++++&% ",
-"--------------; ",
-"-:::::::::::::- ",
-"-:X:XXXXXXXXX:> ",
-"-*************, "
-};

art/folder.xpm

@@ -1,43 +1,27 @@
 /* XPM */
-static char *folder_xpm[] = {
+static char * folder_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* width height ncolors chars_per_pixel */
-"16 15 22 1",
+"16 15 6 1",
-"> c #9BACC2",
+/* colors */
-". c #547897",
+"  s None   c None",
-"1 c #7F99B4",
+". c #000000",
-"X c #D1D9E5",
+"+ c #c0c0c0",
-"< c #EAEDF3",
+"@ c #808080",
-"+ c #CAD2DC",
+"# c #ffff00",
-"3 c #718BA7",
+"$ c #ffffff",
-"O c #BECAD9",
-"$ c #E1E6EE",
-"* c #F5F6F7",
-", c #8DA0B9",
-"  c None",
-"# c #D6DFE7",
-"@ c #D2D9E0",
-"- c #FAFCFE",
-"; c #ADBACE",
-"& c #EEF1F3",
-"= c #F8F9FA",
-"o c #B3BFD1",
-"2 c #7A90AC",
-": c #A2B3C5",
-"% c #E5EAF1",
 /* pixels */
 "                ",
-" .....          ",
+"   @@@@@        ",
-" .XXXX.         ",
+"  @#+#+#@       ",
-" .............  ",
+" @#+#+#+#@@@@@@ ",
-" .oO+@#$%&*=-.  ",
+" @$$$$$$$$$$$$@.",
-" .oO+@#$%&*=-.  ",
+" @$#+#+#+#+#+#@.",
-" .;oO+X#$%&*=.  ",
+" @$+#+#+#+#+#+@.",
-" .:;oO+X#$%&*.  ",
+" @$#+#+#+#+#+#@.",
-" .>:;oO+X#$%&.  ",
+" @$+#+#+#+#+#+@.",
-" .,>:;oO+X#$<.  ",
+" @$#+#+#+#+#+#@.",
-" .1,>:;oO+X#$.  ",
+" @$+#+#+#+#+#+@.",
-" .21,>:;oO+X#.  ",
+" @$#+#+#+#+#+#@.",
-" .321,>:;oO+X.  ",
+" @@@@@@@@@@@@@@.",
-" .............  ",
+"  ..............",
-"                "
+"                "};
-};

art/folder_open.xpm

@@ -1,52 +1,27 @@
 /* XPM */
-static char *folder_open_xpm[] = {
+static char * folder_open_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* width height ncolors chars_per_pixel */
-"16 15 31 1",
+"16 15 6 1",
-"6 c #9BACC2",
+/* colors */
-"w c #547B99",
+"   s None  c None",
-"5 c #94A5BD",
+".  c #000000",
-". c #376485",
+"+  c #c0c0c0",
-"; c #F1F4F7",
+"@  c #808080",
-"o c #7F99B4",
+"#  c #ffff00",
-"2 c #D1D9E5",
+"$  c #ffffff",
-"- c #EAEDF3",
-"O c #718BA7",
-"0 c #65839D",
-"* c #DCE2EA",
-": c #F5F6F7",
-"7 c #597B9A",
-"X c #8DA0B9",
-"  c None",
-"+ c #467291",
-"q c #305F81",
-"& c #D6DFE7",
-"3 c #6A89A2",
-"1 c #A8B6CA",
-"= c #E4E9ED",
-"> c #F8F9FA",
-", c #FDFDFE",
-"9 c #215579",
-"8 c #7F97B0",
-"@ c #B3BFD1",
-"< c #7A90AC",
-"$ c #C2CBDB",
-"4 c #A2B3C5",
-"% c #CAD6E1",
-"# c #BBC4D6",
 /* pixels */
 "                ",
-".....           ",
+"   @@@@@        ",
-".XXXo.          ",
+"  @$$$$$@       ",
-".XXXXO........  ",
+" @$#+#+#$@@@@@@ ",
-".XXXXXXXXXXXX.  ",
+" @$+#+#+$$$$$$@.",
-".XXXXXXXXXXXX.  ",
+" @$#+#+#+#+#+#@.",
-".X++++++++++++++",
+"@@@@@@@@@@@@@#@.",
-".X+@#$%&*=-;:>,+",
+"@$$$$$$$$$$@@+@.",
-".<.1@#$%2*=-;:23",
+"@$#+#+#+#+##.@@.",
-"..X41@#$%2*=-;3 ",
+" @$#+#+#+#+#+.@.",
-"..X561@#$%2*=-3 ",
+" @$+#+#+#+#+#.@.",
-".78X561@#$%2*%3 ",
+"  @$+#+#+#+##@..",
-"90<8X561@#$%23  ",
+"  @@@@@@@@@@@@@.",
-"q++++++++++++w  ",
+"   .............",
-"                "
+"                "};
-};

art/harddisk.xpm

@@ -1,60 +1,26 @@
 /* XPM */
 static char *harddisk_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 39 1",
+"16 15 7 1",
-"7 c #E3E4E6",
+"     s None    c None",
-"4 c #FFFFFF",
+".    c #808080",
-"5 c #839CB5",
+"X    c #c0c0c0",
-". c #547897",
+"o    c Black",
-"1 c #4D7492",
+"O    c Gray100",
-"@ c #376485",
+"+    c Green",
-"o c #7A92A3",
+"@    c #008000",
-"u c #D1D9E5",
-"y c #446A8C",
-"i c #51B03D",
-"> c #CAD2DC",
-"O c #718BA7",
-"2 c #65839D",
-"6 c #DCE2EA",
-"0 c #C3C5C8",
-"9 c #F5F6F7",
-": c #EBEBEC",
-"< c #597B9A",
-"t c #C6CCD3",
-"  c None",
-"* c #DFE0E2",
-"e c #467291",
-"a c #526E8B",
-", c #7393AB",
-"p c #130A0B",
-"# c #AABFCD",
-"r c #B4C4D3",
-"; c #CFCFD0",
-"X c #6F90A6",
-"+ c #6A89A2",
-"- c #D2D3D4",
-"= c #DCDBDA",
-"w c #E4E9ED",
-"q c #C6C8CA",
-"% c #215579",
-"$ c #E7E7E7",
-"3 c #7F97B0",
-"8 c #C0D1DC",
-"& c #5D7C93",
-/* pixels */
 "                ",
-"   .XoooXO+@    ",
+"                ",
-"  #$$%%%%$$$X   ",
+"                ",
-"  &$*==-;$$$&   ",
+"  ............. ",
-"  &:>+,<1234o5  ",
+" .XXXXXXXXXXXX.o",
-" ###+67;;78242  ",
+".OOOOOOOOOOOO..o",
-" &4,49*0q*9we4. ",
+".XXXXXXXXX+@X..o",
-" &4+49*,,*9wo4. ",
+".XXXXXXXXXXXX..o",
-"&4%r,67;;782t%4.",
+".X..........X..o",
-"&44468rrrr84444,",
+".XOOOOOOOOOOX..o",
-"y11111111111111e",
+"..............o ",
-"1uu1:::::::::::1",
+" ooooooooooooo  ",
-"1uu1::::::::ip:1",
+"                ",
-"auu&:::::::::::1",
+"                ",
-"1111111111111111"
+"                "};
-};

art/htmsidep.xpm

@@ -1,7 +1,7 @@
 /* XPM */
 static char *htmsidep_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 6 1",
+"16 16 6 1",
 ". c Black",
 "X c #FFFFFF",
 "+ c #808080",
@@ -23,5 +23,6 @@ static char *htmsidep_xpm[] = {
 " .OOOO.ooooooo. ",
 " .XOXX.o.+...o. ",
 " .XXOX.ooooooo. ",
-" .............. "
+" .............. ",
+"                "
 };

art/listview.xpm

@@ -1,7 +1,7 @@
 /* XPM */
 static char *listview_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 4 1",
+"16 16 4 1",
 "  c Black",
 ". c #FFFFFF",
 "X c #000084",
@@ -13,13 +13,14 @@ static char *listview_xpm[] = {
 " .XXX.  o   o . ",
 " .XXX.......... ",
 " .............. ",
+" .............. ",
 " .XXX.......... ",
 " .XXX.   o    . ",
 " .XXX.......... ",
 " .............. ",
+" .............. ",
 " .XXX.......... ",
 " .XXX. o    o . ",
 " .XXX.......... ",
-" .............. ",
 "                "
 };

art/new.xpm

@@ -1,50 +1,25 @@
 /* XPM */
 static char *new_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 29 1",
+"16 16 3 1",
-"* c #97C4E7",
+". c Black",
-"- c #72A8D2",
+"X c #FFFFFF",
-": c #FFFFFF",
-"9 c #839CB5",
-"o c #6B98B8",
-"X c #5A89A6",
-"# c #3A749C",
-", c #D1E5F5",
-"0 c #85A7BC",
-"$ c #C3DDF1",
-"8 c #749BB4",
-"; c #5F9BC8",
 "  c None",
-"+ c #538DB3",
-"= c #85BBE2",
-"3 c #EFF6FC",
-"O c #6591AE",
-"5 c #F7FBFD",
-"7 c #FAFCFE",
-"< c #DAEAF7",
-"4 c #E9F3FA",
-"6 c #FDFDFE",
-"1 c #E2EFF8",
-". c #8EA9BC",
-"% c #B6D5EE",
-"& c #A5CCEA",
-"> c #ACE95B",
-"2 c #F4F9FD",
-"@ c #4581AA",
 /* pixels */
-"   .XoOO+@#.    ",
+"                ",
-"   .$$%&*=O-;   ",
+"  ........      ",
-"  @@@@$%&*O:*o  ",
+"  .XXXXXX..     ",
-"  @>>@$$%&O::*o ",
+"  .XXXXXX.X.    ",
-"@@@>>@@@$%OOoO+ ",
+"  .XXXXXX....   ",
-"@>>>>>>@,$%&*=+ ",
+"  .XXXXXXXXX.   ",
-"@>>>>>>@<,$%&*+ ",
+"  .XXXXXXXXX.   ",
-"@@@>>@@@1<,$%&O ",
+"  .XXXXXXXXX.   ",
-"  @>>@2341<,$%O ",
+"  .XXXXXXXXX.   ",
-"  @@@@52341<,$o ",
+"  .XXXXXXXXX.   ",
-"   .:6752341<,8 ",
+"  .XXXXXXXXX.   ",
-"   .::6752341<8 ",
+"  .XXXXXXXXX.   ",
-"   .:::67523419 ",
+"  .XXXXXXXXX.   ",
-"   .::::6752340 ",
+"  ...........   ",
-"   ............ "
+"                ",
+"                "
 };

art/new_dir.xpm

@@ -1,43 +1,24 @@
 /* XPM */
 static char *new_dir_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 22 1",
+"16 15 4 1",
-"X c Black",
+"@ c Gray0",
-"> c #9BACC2",
-"o c #547897",
-"1 c #7F99B4",
-"O c #D1D9E5",
-"< c #EAEDF3",
-"# c #CAD2DC",
-"3 c #718BA7",
-"@ c #BECAD9",
-"& c #E1E6EE",
-"; c #F5F6F7",
-". c #FFFF00",
-", c #8DA0B9",
 "  c None",
-"% c #D6DFE7",
+"* c Yellow",
-"$ c #D2D9E0",
+": c Gray100",
-"- c #ADBACE",
-"= c #EEF1F3",
-"+ c #B3BFD1",
-"2 c #7A90AC",
-": c #A2B3C5",
-"* c #E5EAF1",
 /* pixels */
-"         .X .XX.",
+"           @    ",
-" ooooo    .X.X. ",
+"                ",
-" oOOOOo  XX...XX",
+"           @    ",
-" oooooooo.......",
+"        @     @ ",
-" o+@#$%&*XX...XX",
+"   @@@@  @ @ @  ",
-" o+@#$%&*=.X.X. ",
+"  @*:*:@  @ @   ",
-" o-+@#O%&.X;.X .",
+" @@@@@@@@@@  @ @",
-" o:-+@#O%&*=;o  ",
+" @:*:*:*:*:@@   ",
-" o>:-+@#O%&*=o  ",
+" @*:*:*:*:*@ @  ",
-" o,>:-+@#O%&<o  ",
+" @:*:*:*:*:@  @ ",
-" o1,>:-+@#O%&o  ",
+" @*:*:*:*:*@    ",
-" o21,>:-+@#O%o  ",
+" @:*:*:*:*:@    ",
-" o321,>:-+@#Oo  ",
+" @*:*:*:*:*@    ",
-" ooooooooooooo  ",
+" @@@@@@@@@@@    ",
-"                "
+"                "};
-};

art/paste.xpm

@@ -1,46 +1,29 @@
 /* XPM */
 static char *paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 25 1",
+"16 16 7 1",
-"< c #FEECE4",
+". c Black",
-"> c #FEE3D7",
+"@ c #FFFFFF",
-"O c #FFFFFF",
+"O c #808080",
-"o c #7B767D",
+"+ c #000080",
-"% c #F79586",
+"X c #FFFF00",
-"& c #CAE1F3",
+"o c #808000",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
 "  c None",
-"$ c #F8AA8F",
-", c #EFF6FC",
-"1 c #F7FBFD",
-"2 c #FAFCFE",
-"; c #DAEAF7",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
 /* pixels */
-"   ......       ",
+"                ",
-" .XoOOOOoo.     ",
+"     ....       ",
-".+XOOOOOOX@.    ",
+" .....XX.....   ",
-".+XXXXXXXX@.    ",
+".oOo.X..X.OoO.  ",
-".#++$$%@.....   ",
+".OO.      .Oo.  ",
-".##++$$%.&*.=.  ",
+".oO........OO.  ",
-".-##++$$.;&.==. ",
+".OoOoOoOoOoOo.  ",
-".--##++$.:;.... ",
+".oOoOo+++++++.  ",
-".>--##++.,:;&*. ",
+".OoOoO+@@@@@++  ",
-".<>--##+.1,:;&. ",
+".oOoOo+@@@@@+@+ ",
-".<<>--##.21,:;. ",
+".OoOoO+@+++@++++",
-".3<<>--#.O21=:. ",
+".oOoOo+@@@@@@@@+",
-".45<<>--....... ",
+".OoOoO+@++++++@+",
-".6453<>----.    ",
+" .....+@@@@@@@@+",
-"............    "
+"      ++++++++++",
+"                "
 };

art/print.xpm

@@ -1,60 +1,25 @@
 /* XPM */
 static char *print_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 39 1",
+"16 15 5 1",
-"< c #E3E4E6",
-"+ c #C3C3C4",
-"i c #FFFFFF",
-": c #74879B",
-"# c #5A89A6",
-"a c #F1F4F7",
-"r c #5A809C",
-"@ c #BDCCD9",
-"e c #7A92A4",
-"% c #3F6F93",
-"t c #9FA2A6",
-"3 c #939495",
-"w c #5F666D",
-"9 c #65839E",
-"5 c #4A7291",
-"$ c #4B7F9E",
 "  c None",
-"O c #DFE0E2",
+". c Black",
-"o c #F3F3F3",
+"X c Gray100",
-"; c #84A5BB",
+"o c #808000",
-"& c #467291",
+"O c Yellow",
-". c #7897AD",
-"* c #407598",
-"4 c #CFCFD0",
-"7 c #6F90A6",
-"y c #6A89A2",
-"0 c #AAADB2",
-"1 c #D2D3D4",
-"u c #4F7592",
-", c #BCBDBE",
-"p c #57778E",
-"q c #979BA0",
-"2 c #ABABAC",
-"- c #E7E7E7",
-"= c #D6DEE6",
-"> c #9FA0A0",
-"8 c #829EB5",
-"X c #8FB0C3",
-"6 c #5D7C93",
 /* pixels */
-"   .XXXXXXXX    ",
+"     .........  ",
-"   .oooooooX    ",
+"    .XXXXXXXX.  ",
-"   .OOOOOOOX    ",
+"    .X.....X.   ",
-"   .+++++++X    ",
+"   .XXXXXXXX.   ",
-"@##$%&&&&&%*##@ ",
+"   .X.....X.... ",
-"$=-;:>,<123$-=$ ",
+"  .XXXXXXXX. . .",
-".44.5678.96$44. ",
+" .......... . ..",
-"7,,,,,,,,,,,,,7 ",
+".          . . .",
-"900qwwwwwwwe009 ",
+".............  .",
-"rtt9ryyyyyyuttr ",
+".      ooo  . . ",
-"6qq6iiiiiii%qq6 ",
+".      OOO  ... ",
-"633paiiiiii%336 ",
+"............. . ",
-"XXX*iiiiiii%XXX ",
+" .         . .  ",
-"   6iiiiiii%    ",
+"  ...........   ",
-"   $XXXXXXX#    "
+"                "};
-};

art/quit.xpm

@@ -1,90 +1,40 @@
 /* XPM */
 static char *quit_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 69 1",
+"32 32 2 1",
-"@ c Black",
+". c Black",
-"i c #9AEA53",
-"D c #7E9BB1",
-"H c #839FB4",
-", c #B7C7D3",
-"8 c #BCCBD6",
-"7 c #C1CFDA",
-"v c #92ABBD",
-"- c #D0DBE2",
-"O c #547897",
-"+ c #376485",
-"L c #7090A8",
-"t c #AEC0CE",
-"g c #B3C4D1",
-"S c #84A0B4",
-"G c #89A4B8",
-"> c #BDCCD7",
-"F c #5A809C",
-"2 c #C2D0DA",
-"k c #93ACBE",
-"= c #D6E0E6",
-"* c #446A8C",
-"z c #A5B9C8",
-"# c #DEE5EB",
-"0 c #AFC1CE",
-"r c #B4C5D2",
-"p c #B9C9D5",
-"A c #8AA5B8",
-"M c #92AABD",
-"j c #A6BAC9",
-"K c #7796AC",
-"l c #ABBECC",
-"o c #E4EAEF",
-"9 c #B5C6D2",
 "  c None",
-"; c #C9D6DF",
-"X c #305F81",
-"m c #98AFC0",
-"V c #9DB3C3",
-"% c #D1DBE3",
-"u c #A2B7C6",
-"y c #A7BBCA",
-"h c #ACBFCD",
-"4 c #B6C7D3",
-"w c #C0CFD9",
-"d c #982106",
-"B c #85A0B5",
-"6 c #C8D4DE",
-"c c #99B0C1",
-"x c #9EB4C4",
-"$ c #D7E0E7",
-"q c #A8BCCA",
-"s c #ADC0CD",
-"3 c #BCCCD7",
-"N c #8BA5B9",
-": c #C4D1DB",
-"1 c #C9D5DE",
-"f c #9AB1C2",
-"n c #A4B9C8",
-"a c #B3C5D1",
-". c #215579",
-"J c #7D9AB0",
-"& c #829EB5",
-"e c #BBCAD6",
-"b c #8CA6B9",
-"Z c #91AABC",
-"C c #96AEC0",
-"< c #CFDAE2",
-"5 c #AFC2CF",
 /* pixels */
-" ..XXXXXXXXXX   ",
+"                                ",
-" XoO+X@@@@@@X   ",
+"                                ",
-" X#$%&X*@@@@X   ",
+"                                ",
-" X=-;:>,X@@@X   ",
+"                                ",
-" X<12345X@@@X   ",
+"                                ",
-" X67890qX@XXX   ",
+"                                ",
-" XwertyuX@XiX   ",
+"           ....   ...           ",
-" XpasddfX++iiX  ",
+"           .   . .   .          ",
-" XghjddkXiiiiiX ",
+"           .   . .   .          ",
-" XlzxcvbXiiiiiiX",
+"           .   . .   .          ",
-" XnxmMNBXiiiiiX ",
+"           .   . .   .          ",
-" XVCZASDXXXiiX  ",
+"           .   .  ...           ",
-" XXFGHJKX XiX   ",
+"                                ",
-"   FXXFLX XX    ",
+"                                ",
-"      XX*       "
+"                                ",
+"                                ",
+"                                ",
+"       .                        ",
+"                                ",
+"       .  ...  ...  ....        ",
+"       . .    .   . .   .       ",
+"       . .    .   . .   .       ",
+"       . .    .   . .   .       ",
+"       . .    .   . .   .       ",
+"       .  ...  ...  .   .       ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
 };

art/redo.xpm

@@ -1,58 +1,25 @@
 /* XPM */
 static char *redo_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 37 1",
+"16 16 3 1",
-"4 c #9BACC2",
+". c #808080",
-"; c #4C7398",
+"X c #000080",
-"3 c #547B99",
-"* c #547897",
-"# c #5A89A6",
-"8 c #3A749C",
-"5 c #5A809C",
-", c #7F99B4",
-"& c #3F6F93",
-"9 c #85A7BC",
-"+ c #749BB4",
-"> c #718BA7",
-"e c #A5B3C8",
-"w c #BECAD9",
-": c #65839D",
-"u c #E1E6EE",
-"o c #236289",
-"r c #ADBED2",
-"= c #597B9A",
-"2 c #8DA0B9",
 "  c None",
-"% c #467291",
-"1 c #7393AB",
-"i c #4C809F",
-"- c #A0BACB",
-"O c #6591AE",
-"X c #407598",
-"6 c #6F90A6",
-"t c #D2D9E0",
-"7 c #ADBACE",
-"@ c #326A8F",
-"0 c #467A9C",
-". c #ACC4D3",
-"< c #7F97B0",
-"y c #B3BFD1",
-"q c #A2B3C5",
-"$ c #8FB0C3",
 /* pixels */
-"   .XoooO       ",
+"                ",
-"  +o@@@@@o#    +",
+"                ",
-" $@%%&@&%%&@  +o",
+"                ",
-" X*=@+-+@*=;@#&@",
+"                ",
-" @:=+    @=:=*:@",
+"   .XXXX        ",
-" &>:$     @:>>>@",
+"  .X    XX   X  ",
-" &,<X     X>,,,&",
+"  X       X XX  ",
-" +123    @<2222&",
+"  X        XXX  ",
-"  X44X  #@56<44X",
+"  X       XXXX  ",
-"  O1748    .9#&o",
+"  .X     XXXXX  ",
-"   0qwe8        ",
+"   X.           ",
-"    8rty8       ",
+"                ",
-"     8wu+       ",
+"                ",
-"      i##       ",
+"                ",
+"                ",
 "                "
 };

art/removable.xpm

@@ -1,44 +1,26 @@
 /* XPM */
 static char *removable_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 15 7 1",
-"@ c #C3C3C4",
+"     s None    c None",
-"4 c #FFFFFF",
+".    c #808080",
-"o c #D5D6D8",
+"X    c #c0c0c0",
-"> c #7A92A3",
+"o    c Black",
-". c #8497A5",
+"O    c Gray100",
-"% c #ACAEB2",
+"+    c Red",
-"2 c #4A7898",
+"@    c #800000",
-": c #DCE2EA",
+"                ",
-", c #F5F6F7",
+"                ",
-"= c #EBEBEC",
+"  ............. ",
-"$ c #B7B7B8",
+" .XXXXXXXXXXXX.o",
-"  c None",
+".OOOOOOOOOOOO..o",
-"X c #DFE0E2",
+".OXXXXXXXXXXX..o",
-"* c #A6A8AD",
+".O+@.oooooo.X..o",
-"1 c #4C809F",
+".OXXOooooooOX..o",
-"3 c #407598",
+".OXXXOOOOOOXX..o",
-"O c #CFCFD0",
+".OXXXXXXXXXXX..o",
-"; c #9EA2A8",
+".O............o ",
-"# c #BCBDBE",
+" ooooooooooooo  ",
-"+ c #C6C8CA",
+"                ",
-"- c #979BA0",
+"                ",
-"& c #E7E7E7",
+"                "};
-"< c #8FB0C3",
-/* pixels */
-"   .........    ",
-"   .XoO+@#$%.   ",
-"   .XoO+@#$%.   ",
-"  .&XoO+@#$%*.  ",
-"  .&XoO+@#$%*.  ",
-" .=&XoO+@#$%*-. ",
-" .=&XoO+@#$%*;. ",
-".:=&XoO+@#$%*;>.",
-".,=&XoO+@#$%*;-.",
-"<..............<",
-"<,=&XoO+@#$%%%%.",
-"<O1111122233*4*.",
-"<OOOOOOOOOOO***.",
-" <<<<<<<<<<<<<< ",
-"                "
-};

art/repview.xpm

@@ -1,7 +1,7 @@
 /* XPM */
 static char *repview_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 3 1",
+"16 16 3 1",
 "  c Black",
 "X c #FFFFFF",
 ". c #C0C0C0",
@@ -10,7 +10,8 @@ static char *repview_xpm[] = {
 " .............. ",
 " .  .    .    . ",
 " .............. ",
-" .............. ",
+" XXXXXXXXXXXXXX ",
+" X  X    X    X ",
 " XXXXXXXXXXXXXX ",
 " X  X    X    X ",
 " XXXXXXXXXXXXXX ",

art/undo.xpm

@@ -1,58 +1,25 @@
 /* XPM */
 static char *undo_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 37 1",
+"16 16 3 1",
-"4 c #9BACC2",
+"X c #808080",
-"* c #4C7398",
+". c #000080",
-"2 c #547B99",
-"- c #547897",
-"@ c #5A89A6",
-"8 c #3A749C",
-"6 c #5A809C",
-", c #7F99B4",
-"$ c #3F6F93",
-"7 c #85A7BC",
-"+ c #749BB4",
-"> c #718BA7",
-"0 c #A5B3C8",
-"q c #BECAD9",
-": c #65839D",
-"u c #E1E6EE",
-"X c #236289",
-"y c #ADBED2",
-"= c #597B9A",
-"1 c #8DA0B9",
 "  c None",
-"% c #467291",
-"3 c #7393AB",
-"i c #4C809F",
-"; c #A0BACB",
-". c #6591AE",
-"o c #407598",
-"5 c #6F90A6",
-"t c #D2D9E0",
-"9 c #ADBACE",
-"# c #326A8F",
-"e c #467A9C",
-"O c #ACC4D3",
-"< c #7F97B0",
-"r c #B3BFD1",
-"w c #A2B3C5",
-"& c #8FB0C3",
 /* pixels */
-"       .XXXoO   ",
+"                ",
-"+    @X#####X+  ",
+"                ",
-"X+  #$%%$#$%%#& ",
+"                ",
-"#$@#*=-#+;+#=-o ",
+"                ",
-"#:-=:=#    +=:# ",
+"        ....X   ",
-"#>>>:#     &:>$ ",
+"  .   ..    .X  ",
-"$,,,>o     o<,$ ",
+"  .. .       .  ",
-"$1111<#    213+ ",
+"  ...        .  ",
-"o44<56#@  o44o  ",
+"  ....       .  ",
-"X$@7O    8493.  ",
+"  .....     .X  ",
-"        80qwe   ",
+"           X.   ",
-"       8rty8    ",
+"                ",
-"       +uq8     ",
+"                ",
-"       @@i      ",
+"                ",
+"                ",
 "                "
 };

autoconf_inc.m4

@@ -308,7 +308,7 @@ dnl ### begin block 20_COND_PLATFORM_MAC_1[../../contrib/samples/animate/anitest
         COND_PLATFORM_MAC_1=""
     fi
     AC_SUBST(COND_PLATFORM_MAC_1)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/rttitest/minimal.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/scrolltest/minimal.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wxmovie/minimal.bkl,../../samples/wxvideo/minimal.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ###
     COND_PLATFORM_MSDOS_1="#"
     if test "x$PLATFORM_MSDOS" = "x1" ; then
         COND_PLATFORM_MSDOS_1=""

build/bakefiles/common.bkl

@@ -51,13 +51,8 @@
 
     <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
 
-    <!-- this needs to be reset to 0 on beginning of stable series and
-         increment by one 1 every time binary incompatible change is made
-         (i.e. preferably never) -->
-    <set var="WX_BINARY_VERSION">0</set>
-    
     <set var="WXSOVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
+        <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
         <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
     </set>
     <set var="WXMACVERSION">$(WX_VERSION)</set>

build/bakefiles/make_dist.mk

@@ -141,6 +141,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/xml
 	mkdir $(DISTDIR)/include/wx/xrc
 	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
@@ -621,34 +622,22 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
 
 	mkdir $(DISTDIR)/samples/internat
-	mkdir $(DISTDIR)/samples/internat/bg
-	mkdir $(DISTDIR)/samples/internat/cs
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
-	mkdir $(DISTDIR)/samples/internat/ja
+	mkdir $(DISTDIR)/samples/internat/ju
-	mkdir $(DISTDIR)/samples/internat/ka
-	mkdir $(DISTDIR)/samples/internat/pl
 	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
-	cp $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg
-	cp $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs
-	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja
-	cp $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka
-	cp $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl
 	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
-	cp $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg
-	cp $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs
-	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja
-	cp $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka
-	cp $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl
 	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
@@ -786,6 +775,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
 #	mkdir $(DISTDIR)/samples/resource
 #	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource

build/bakefiles/wxpresets/bakefile_quickstart.txt

@@ -149,7 +149,7 @@ built. In Bakefile, you specify the target by creating a tag named with the
 target type. The possible names for targets are:
 
     exe         create an executable file
-    dll         create a shared library
+    dll         create a shared libary
     lib         create a static library
     module      create a library that is loaded at runtime (i.e. a plugin)
 

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -34,7 +34,7 @@ FIXME: this template has (at least) the following bugs:
     <!--    In MSVC these are the different build                   -->
     <!--    configurations you can have (in the build menu),        -->
     <!--    and in autoconf is enabled with enable-xxx=xx.          -->
-    <!--    For other compilers a separate configuration            -->
+    <!--    For other compilers a seperate configuration            -->
     <!--    file is created (such as config.gcc on gcc)             -->
     <!--    which has several options a user can modify.            -->
     <!--                                                            -->
@@ -155,7 +155,7 @@ FIXME: this template has (at least) the following bugs:
     <!--                                                            -->
     <!--    The "base class" of all our build targets               -->
     <!--    This links with the appropriate native                  -->
-    <!--    libraries required by the platform, the libraries       -->
+    <!--    libraries required by the platform, the libaries        -->
     <!--    we want for our stuff, and the wxWindows libs.          -->
 
 

build/bakefiles/wxpresets/sample/configure.in

@@ -38,7 +38,7 @@ if test "$WXFOUND" != 1; then
     ])
 fi
 
-AC_BAKEFILE([m4_include(autoconf_inc.m4)])
+AC_BAKEFILE
 
 
 AC_CONFIG_FILES([

build/bakefiles/wxwin.py

@@ -109,11 +109,11 @@ def getVersion():
         major = minor = release = None
         for l in lines:
             if not l.startswith('#define'): continue
-            splitline = l.strip().split()
+            splitted = l.strip().split()
-            if splitline[0] != '#define': continue
+            if splitted[0] != '#define': continue
-            if len(splitline) < 3: continue
+            if len(splitted) < 3: continue
-            name = splitline[1]
+            name = splitted[1]
-            value = splitline[2]
+            value = splitted[2]
             if value == None: continue
             if name == 'wxMAJOR_VERSION': major = int(value)
             if name == 'wxMINOR_VERSION': minor = int(value)

build/msw/makefile.bcc

@@ -3522,7 +3522,7 @@ $(SETUPHDIR)\wx\setup.h:
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=6 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

build/msw/makefile.gcc

@@ -3625,7 +3625,7 @@ $(SETUPHDIR)\wx\setup.h:
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=6 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

build/msw/makefile.vc

@@ -3812,7 +3812,7 @@ $(SETUPHDIR)\wx\setup.h:
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=6 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

build/msw/makefile.wat

@@ -3838,7 +3838,7 @@ $(SETUPHDIR)\wx\setup.h :
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=6 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

build/msw/wx_base.dsp

@@ -1045,10 +1045,6 @@ SOURCE=..\..\include\wx\msw\stackwalk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\stdpaths.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\winundef.h
 # End Source File
 # Begin Source File

build/msw/wx_core.dsp

@@ -7489,10 +7489,6 @@ SOURCE=..\..\include\wx\msw\helpwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\htmlhelp.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\icon.h
 # End Source File
 # Begin Source File
@@ -7697,10 +7693,6 @@ SOURCE=..\..\include\wx\msw\uxtheme.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\uxthemep.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\window.h
 # End Source File
 # End Group

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.6.1.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.6.0.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.6.1'
+PACKAGE_VERSION='2.6.0'
-PACKAGE_STRING='wxWidgets 2.6.1'
+PACKAGE_STRING='wxWidgets 2.6.0'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
@@ -794,7 +794,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wxWidgets 2.6.1 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -860,7 +860,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.6.1:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1197,7 +1197,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 2.6.1
+wxWidgets configure 2.6.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1211,7 +1211,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wxWidgets $as_me 2.6.1, which was
+It was created by wxWidgets $as_me 2.6.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1662,8 +1662,8 @@ test -n "$target_alias" &&
 
 wx_major_version_number=2
 wx_minor_version_number=6
-wx_release_number=1
+wx_release_number=0
-wx_subrelease_number=0
+wx_subrelease_number=1
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -1672,7 +1672,7 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 
 WX_CURRENT=0
-WX_REVISION=1
+WX_REVISION=0
 WX_AGE=0
 
 
@@ -44599,7 +44599,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by wxWidgets $as_me 2.6.1, which was
+This file was extended by wxWidgets $as_me 2.6.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -44662,7 +44662,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.6.1
+wxWidgets config.status 2.6.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.6.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.6.0], [wx-dev@lists.wxwidgets.org])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -56,8 +56,8 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 
 wx_major_version_number=2
 wx_minor_version_number=6
-wx_release_number=1
+wx_release_number=0
-wx_subrelease_number=0
+wx_subrelease_number=1
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -66,7 +66,7 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 
 WX_CURRENT=0
-WX_REVISION=1
+WX_REVISION=0
 WX_AGE=0
 
 
@@ -3296,7 +3296,7 @@ dnl ----------------------------------------------------------------
 IODBC_C_SRC=""
 
 
-dnl ODBC is handled separately for MSW 
+dnl ODBC is handled seperately for MSW 
 if test "$TOOLKIT" != "MSW" ; then
 
     if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
@@ -3468,7 +3468,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
 
         if test "x$OPENGL_LIBS" = "x"; then
             dnl it should be an error and not a warning because OpenGL is not on
-            dnl by default and so if it had been explicitly requested, we
+            dnl by default and so if it had been explicitely requested, we
             dnl shouldn't just fall back to compiling the library without it
             AC_MSG_ERROR(OpenGL libraries not available)
         fi

contrib/docs/latex/mmedia/sndbase.tex

@@ -30,8 +30,8 @@ No base class
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf wxSOUND\_NOERR}}{No error occurred}
+\twocolitem{{\bf wxSOUND\_NOERR}}{No error occured}
-\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occurred, it may concern
+\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occured, it may concern
 either a driver or a file}
 \twocolitem{{\bf wxSOUND\_INVFRMT}}{The sound format passed to the function is
 invalid. Generally, it means that you passed out of range values to the codec
@@ -271,7 +271,7 @@ Sets the event handler: if it is non-null, all events are routed to it.
 
 \constfunc{wxSoundError}{GetError}{\void}
 
-It returns the last error which occurred.
+It returns the last error which occured.
 
 \membersection{wxSoundStream::GetLastAccess}\label{wxsoundstreamgetlastaccess}
 
@@ -290,5 +290,5 @@ until the IO queue has at least one empty entry.
 
 \func{void}{OnSoundEvent}{\param{int }{evt}}
 
-It is called by the wxSoundStream when a new sound event occurred.
+It is called by the wxSoundStream when a new sound event occured.
 

contrib/include/wx/fl/controlbar.h

@@ -888,7 +888,7 @@ class cbBarInfo : public wxObject
 {
     DECLARE_DYNAMIC_CLASS( cbBarInfo )
 public:
-    // textual name, by which this bar is referred in layout-customization dialogs
+    // textual name, by which this bar is refered in layout-customization dialogs
     wxString      mName;
 
     // stores bar's bounds in pane's coordinates

contrib/include/wx/foldbar/captionbar.h

@@ -24,7 +24,7 @@
 
 #define wxFPB_EXTRA_X 10
 #define wxFPB_EXTRA_Y 4
-#define wxFPB_BMP_RIGHTSPACE 2    // pixels of the bmp to be aligned from the right filled with space
+#define wxFPB_BMP_RIGHTSPACE 2    // pixels of the bmp to be alligned from the right filled with space
 
 enum
 {

contrib/include/wx/foldbar/foldpanelbar.h

@@ -96,7 +96,7 @@ WX_DEFINE_ARRAY_PTR(wxFoldPanelItem *, wxFoldPanelItemArray);
 
     This control is easy to use. Simply create it as a child for a panel or sash window, and populate panels with
     wxFoldPanelBar::AddFoldPanel(). Then use the wxFoldPanelBar::AddFoldPanelWindow() to add wxWindow derived controls
-    to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeparator() to put separators between the groups of
+    to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeperator() to put separators between the groups of
     controls that need a visual separator to group them together. After all is constructed, the user can fold
     the panels by doubleclicking on the bar or single click on the arrow, which will indicate the collapsed or
     expanded state.
@@ -125,12 +125,12 @@ private:
     void RefreshPanelsFrom(wxFoldPanelItem *item);
 
     /** Returns the length of the panels that are expanded and collapsed. This is useful to determine
-        quickly what size is used to display, and what is left at the bottom (right) to align
+        quickly what size is used to display, and what is left at the bottom (right) to allign
         the collapsed panels. */
     int GetPanelsLength(int &collapsed, int &expanded);
 
     /** Reposition all the collapsed panels to the bottom. When it is not possible to
-        align them to the bottom, stick them behind the visible panels. The Rect holds the
+        allign them to the bottom, stick them behind the visible panels. The Rect holds the
         slack area left between last repositioned panel and the bottom panels. This needs to
         get a refresh */
     wxRect RepositionCollapsedToBottom();
@@ -167,9 +167,9 @@ public:
 
     /** Adds a wxWindow derived class to the referenced wxFoldPanel. IMPORTANT: Make the to be created window,
         child of the wxFoldPanel. See example that follows. The flags to be used are:
-        - wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be aligned to fit the width of the
+        - wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be alligned to fit the width of the
           wxFoldPanel when it is resized. Very handy for sizer items, buttons and text boxes.
-        - wxFPB_ALIGN_LEFT: Aligns left instead of fitting the width of the child window to be added. Use either
+        - wxFPB_ALIGN_LEFT: Alligns left instead of fitting the width of the child window to be added. Use either
           this one or wxFPB_ALIGN_WIDTH.
 
         The wxWindow to be added can be slightly indented from left and right so it is more visibly placed
@@ -196,7 +196,7 @@ public:
             // color and also the indents and width alligning like a control.
             m_pnl->AddFoldPanelSeperator(item);
 
-            // now add a text ctrl. Also very easy. Align this on width so that when the control gets wider
+            // now add a text ctrl. Also very easy. Allign this on width so that when the control gets wider
             // the text control also sizes along.
             m_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, wxT("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
 
@@ -206,8 +206,8 @@ public:
                            int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTSPACING,
                            int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING);
 
-    /** Adds a separator line to the current wxFoldPanel. The separator is a simple line which is drawn and is no
+    /** Adds a seperator line to the current wxFoldPanel. The seperator is a simple line which is drawn and is no
-        real component. It can be used to separate groups of controls which belong to each other. The colour is
+        real component. It can be used to seperate groups of controls which belong to eachother. The colour is
         adjustable, and it takes the same ySpacing, leftSpacing and rightSpacing as AddFoldPanelWindow(). */
     int AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color = wxColour(167,167,167),
                            int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING,

contrib/include/wx/foldbar/foldpanelitem.h

@@ -121,13 +121,13 @@ public:
     };
 
     // resize the element, whatever it is. A separator or
-    // line will be always aligned by width or height
+    // line will be always alligned by width or hight
     // depending on orientation of the whole panel
 
     void ResizeItem(int size, bool vertical) {
         if(m_flags & wxFPB_ALIGN_WIDTH)
         {
-            // align by taking full width
+            // allign by taking full width
             int mySize = size - m_leftSpacing - m_rightSpacing;
 
             if(mySize < 0)
@@ -185,7 +185,7 @@ public:
     virtual ~wxFoldPanelItem();
 
     /** Add a window item to the list of items on this panel. The flags are wxFPB_ALIGN_LEFT for a non sizing
-        window element, and wxFPB_ALIGN_WIDTH for a width aligned item. The ySpacing parameter reserves a number
+        window element, and wxFPB_ALIGN_WIDTH for a width alligned item. The ySpacing parameter reserves a number
         of pixels before the window element, and leftSpacing is an indent. rightSpacing is only relevant when the
         style wxFPB_ALIGN_WIDTH is chosen. */
     void AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing);

contrib/include/wx/mmedia/sndbase.h

@@ -45,8 +45,8 @@ typedef enum {
 
 // ---------------------
 // wxSoundError:
-//   - wxSOUND_NOERR: No error occurred
+//   - wxSOUND_NOERR: No error occured
-//   - wxSOUND_IOERR: an input/output error occurred, it may concern either
+//   - wxSOUND_IOERR: an input/output error occured, it may concern either
 //                    a driver or a file
 //   - wxSOUND_INVFRMT: the sound format passed to the function is invalid.
 //                      Generally, it means that you passed out of range values
@@ -83,7 +83,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream;
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.
 //    - stream: current wxSoundStream
-//    - evt: the sound event which has occurred, it may be wxSOUND_INPUT,
+//    - evt: the sound event which has occured, it may be wxSOUND_INPUT,
 //            wxSOUND_OUTPUT or wxSOUND_DUPLEX
 //    - cdata: User callback data
 // ---------------------

contrib/samples/animate/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/deprecated/proplist/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/deprecated/resource/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/deprecated/treelay/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/fl/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/foldbar/extended/Makefile.in

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/foldbar/foldpanelbar/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/gizmos/dynsash/Makefile.in

@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/gizmos/dynsash_switch/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/gizmos/editlbox/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/gizmos/led/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/gizmos/multicell/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/gizmos/splittree/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/mmedia/Makefile.in

@@ -37,7 +37,7 @@ EXTRALIBS_ESD = @EXTRALIBS_ESD@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/ogl/ogledit/Makefile.in

@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/ogl/studio/Makefile.in

@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

contrib/samples/ogl/studio/bitmaps/copy.xpm

@@ -1,44 +1,25 @@
 /* XPM */
 static char *copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 15 4 1",
-"+ c #769CDA",
-": c #DCE6F6",
-"X c #3365B7",
-"* c #FFFFFF",
-"o c #9AB6E4",
-"< c #EAF0FA",
-"# c #B1C7EB",
-". c #6992D7",
-"3 c #F7F9FD",
-", c #F0F5FC",
-"$ c #A8C0E8",
 "  c None",
-"- c #FDFEFF",
+". c Black",
-"& c #C4D5F0",
+"X c Gray100",
-"1 c #E2EAF8",
+"o c #000080",
-"O c #89A9DF",
-"= c #D2DFF4",
-"4 c #FAFCFE",
-"2 c #F5F8FD",
-"; c #DFE8F7",
-"% c #B8CCEC",
-"> c #E5EDF9",
-"@ c #648FD6",
 /* pixels */
-" .....XX        ",
+"                ",
-" .oO+@X#X       ",
+" ......         ",
-" .$oO+X##X      ",
+" .XXXX..        ",
-" .%$o........   ",
+" .XXXX.X.       ",
-" .&%$.*=&#o.-.  ",
+" .X..X.oooooo   ",
-" .=&%.*;=&#.--. ",
+" .XXXXXoXXXXoo  ",
-" .:=&.*>;=&.... ",
+" .X....oXXXXoXo ",
-" .>:=.*,>;=&#o. ",
+" .XXXXXoX..Xoooo",
-" .<1:.*2,>:=&#. ",
+" .X....oXXXXXXXo",
-" .2<1.*32,>:=&. ",
+" .XXXXXoX.....Xo",
-" .32<.*432,>:=. ",
+" ......oXXXXXXXo",
-" .32<.*-432,>:. ",
+"       oX.....Xo",
-" .....**-432,>. ",
+"       oXXXXXXXo",
-"     .***-432,. ",
+"       ooooooooo",
-"     .......... "
+"                "
 };

contrib/samples/ogl/studio/bitmaps/cut.xpm

@@ -1,46 +1,24 @@
 /* XPM */
 static char *cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 25 1",
+"16 15 3 1",
-"6 c #D8BDC0",
-": c #C3C3C4",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
 "  c None",
-"* c #DFE0E2",
+". c Black",
-"5 c #B69596",
+"X c #000080",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
 /* pixels */
-"   .X     .o    ",
+"                ",
-"   O.+   @.     ",
+"     .   .      ",
-"    O.   ..     ",
+"     .   .      ",
-"    O#$ %.&     ",
+"     .   .      ",
-"     O.*..      ",
+"     .. ..      ",
-"     #%#..      ",
+"      . .       ",
-"     O=-..      ",
+"      ...       ",
-"     #%#;.      ",
+"       .        ",
-"     OO:=O      ",
+"      X.X       ",
-"  >,,<, ,<,,1   ",
+"      X XXX     ",
-" ><23<1 1<32<1  ",
+"    XXX X  X    ",
-" ,2 4<   <5 2,  ",
+"   X  X X  X    ",
-" <, ,2   2, ,<  ",
+"   X  X X  X    ",
-" 23,<5   5<,32  ",
+"   X  X  XX     ",
-" 6225     522>  "
+"    XX          "
 };

contrib/samples/ogl/studio/bitmaps/help.xpm

@@ -1,71 +1,24 @@
 /* XPM */
 static char *help_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 50 1",
+"16 15 3 1",
-"j c #4E7FD0",
-"8 c #EDF2FB",
-", c #7198D9",
-"e c #DCE6F6",
-"y c #FFFFFF",
-"5 c #95B2E3",
-"$ c #9AB6E4",
-"g c #EAF0FA",
-"1 c #2D59A3",
-"@ c #B1C7EB",
-"> c #6992D7",
-"a c #D9E4F5",
-"r c #356AC1",
-"6 c #9BB7E5",
-"= c #F7F9FD",
-"+ c #BED0EE",
-"z c #F0F5FC",
-"f c #ADC4E9",
-"# c #A8C0E8",
-"7 c #CBD9F1",
-"u c #366BC2",
 "  c None",
-"c c #FDFEFF",
+". c Black",
-"w c #274D8D",
+"X c #008080",
-"t c #C4D5F0",
-"% c #7CA0DC",
-"h c #E2EAF8",
-"p c #487BCE",
-"o c #4377CD",
-"4 c #2A549A",
-"< c #254A87",
-"O c #CCDAF2",
-"& c #89A9DF",
-"9 c #2B559B",
-"* c #D2DFF4",
-". c #3366BB",
-": c #2E5CA8",
-"x c #FAFCFE",
-"l c #F5F8FD",
-"2 c #799EDB",
-"d c #DFE8F7",
-"; c #A6BFE8",
-"3 c #638ED5",
-"- c #5282D0",
-"X c #2A5398",
-"0 c #B8CCEC",
-"s c #376EC9",
-"q c #2D5AA5",
-"i c #285092",
-"k c #8CACE0",
 /* pixels */
-"   .......Xo    ",
+"                ",
-"   .O+@#$%.&o   ",
+"     ......     ",
-"   .*O+@#$.=&-  ",
+"    .XXXXX..    ",
-"  ;:::>#@#.==&: ",
+"   .XX...XX..   ",
-" ,<1234<>@....: ",
+"   .X..  .X..   ",
-"5<X67869<&0#$&. ",
+"   .X.. .XX..   ",
-"q99wwe;9Xrt0#$. ",
+"    .. .XX..    ",
-"<99X&yu99iOt0#. ",
+"      .XX..     ",
-"<99wyp999<aOt0. ",
+"      .X..      ",
-"<99X<u99XsdaOt. ",
+"      .X..      ",
-",w9<y;99<fghaO. ",
+"      .X..      ",
-" j<X<XX<klzgha. ",
+"       ..       ",
-"  5:::j7x=lzgh. ",
+"      .XX..     ",
-"   .yyyccx=lzg. ",
+"      .XX..     ",
-"   ............ "
+"       ...      "
 };

contrib/samples/ogl/studio/bitmaps/new.xpm

@@ -1,52 +1,24 @@
 /* XPM */
 static char *new_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"15 15 31 1",
+"16 15 3 1",
-". c #7198D9",
-"2 c #DCE6F6",
-", c #FFFFFF",
-"= c #9AB6E4",
-"6 c #EAF0FA",
-"w c #6992D7",
-"0 c #5886D2",
-"7 c #F7F9FD",
-"5 c #F0F5FC",
-"* c #A8C0E8",
 "  c None",
-"8 c #FDFEFF",
+". c Black",
-"% c #C4D5F0",
+"X c Gray100",
-"3 c #E2EAF8",
-"+ c #4377CD",
-"O c #487BCE",
-"; c #6B94D7",
-"- c #89A9DF",
-": c #5584D1",
-"# c #3569BF",
-"@ c #3A70CA",
-"1 c #D2DFF4",
-"> c #3366BB",
-"$ c #2E5CA8",
-"9 c #FAFCFE",
-"4 c #F5F8FD",
-"q c #638ED5",
-"o c #5282D0",
-"& c #B8CCEC",
-"X c #376EC9",
-"< c #ACE95B",
 /* pixels */
-"   .XoO+@#$.   ",
+"                ",
-"   .%%&*=-O;:  ",
+"   ........     ",
-"  >>>>%&*=O,=o ",
+"   .XXXXXX..    ",
-"  ><<>%%&*O,,=o",
+"   .XXXXXX.X.   ",
-">>><<>>>%&OOo+@",
+"   .XXXXXX....  ",
-"><<<<<<>1%&*=-@",
+"   .XXXXXXXXX.  ",
-"><<<<<<>21%&*=@",
+"   .XXXXXXXXX.  ",
-">>><<>>>321%&*+",
+"   .XXXXXXXXX.  ",
-"  ><<>456321%&O",
+"   .XXXXXXXXX.  ",
-"  >>>>7456321%o",
+"   .XXXXXXXXX.  ",
-"   .,8974563210",
+"   .XXXXXXXXX.  ",
-"   .,,897456320",
+"   .XXXXXXXXX.  ",
-"   .,,,8974563q",
+"   .XXXXXXXXX.  ",
-"   .,,,,897456w",
+"   ...........  ",
-"   ............"
+"                "
 };

contrib/samples/ogl/studio/bitmaps/open.xpm

@@ -1,57 +1,26 @@
 /* XPM */
 static char *open_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 36 1",
+"16 15 5 1",
-", c #AAC1E8",
-"1 c #9AEA53",
-"q c #DCE6F6",
-". c #295193",
-"; c #A9D066",
-"r c #C6D6F0",
-"$ c #4A7CCE",
-"9 c #779DDB",
-"8 c #EAF0FA",
-"O c #6E96D8",
-"X c #214279",
-"e c #BED0EE",
-"6 c #85A7DF",
-"5 c #F0F5FC",
-"t c #ADC4E9",
-": c #3161B1",
 "  c None",
-"u c #274D8B",
+". c Black",
-"& c #BFDC9B",
+"X c Yellow",
-"> c #9FB9E5",
+"o c Gray100",
-"y c #5584D1",
+"O c #bfbf00",
-"w c #3569BF",
-"% c #3A70CA",
-"+ c #305FAC",
-"3 c #5D89D3",
-"0 c #D2DFF4",
-"@ c #CAE2AA",
-"= c #B2D58C",
-"2 c #FAFCFE",
-"# c #638ED5",
-"* c #CEDCF2",
-"4 c #90AFE2",
-"< c #B3C8EB",
-"7 c #E5EDF9",
-"- c #A2BCE6",
-"o c #DFF0D0",
 /* pixels */
 "                ",
-"     ....       ",
+"          ...   ",
-"XXXXX .oo.      ",
+"         .   . .",
-"XOOOO+ .@o.     ",
+"              ..",
-"XOOOO#$%.&*XXX  ",
+"  ...        ...",
-"XOOOOOOO.=*X-X  ",
+" .XoX.......    ",
-"XOXXXX...;*XXXX:",
+" .oXoXoXoXo.    ",
-"XOX>,<.11111*X2:",
+" .XoXoXoXoX.    ",
-"X3X4>,<.111*X5-:",
+" .oXoX..........",
-"XX#64>,,.1*X78: ",
+" .XoX.OOOOOOOOO.",
-"XXO964>,,.X0q7: ",
+" .oo.OOOOOOOOO. ",
-"Xw3O964>,,er0t: ",
+" .X.OOOOOOOOO.  ",
-"X%y3O964>,<er:  ",
+" ..OOOOOOOOO.   ",
-"uXXXXXXXXXXXX:  ",
+" ...........    ",
 "                "
 };

contrib/samples/ogl/studio/bitmaps/paste.xpm

@@ -1,46 +1,27 @@
 /* XPM */
 static char *paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 25 1",
+"16 15 6 1",
-"< c #FEECE4",
-"> c #FEE3D7",
-"O c #FFFFFF",
-"o c #7B767D",
-"% c #F79586",
-"& c #CAE1F3",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
 "  c None",
-"$ c #F8AA8F",
+". c Black",
-", c #EFF6FC",
+"X c Yellow",
-"1 c #F7FBFD",
+"o c #808080",
-"2 c #FAFCFE",
+"O c #000080",
-"; c #DAEAF7",
+"+ c Gray100",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
 /* pixels */
-"   ......       ",
+"                ",
-" .XoOOOOoo.     ",
+"     ....       ",
-".+XOOOOOOX@.    ",
+" .....XX.....   ",
-".+XXXXXXXX@.    ",
+".ooo.X..X.ooo.  ",
-".#++$$%@.....   ",
+".oo.      .oo.  ",
-".##++$$%.&*.=.  ",
+".oo........oo.  ",
-".-##++$$.;&.==. ",
+".oooooooooooo.  ",
-".--##++$.:;.... ",
+".oooooOOOOOOO.  ",
-".>--##++.,:;&*. ",
+".oooooO+++++OO  ",
-".<>--##+.1,:;&. ",
+".oooooO+++++O+O ",
-".<<>--##.21,:;. ",
+".oooooO+OOO+OOO ",
-".3<<>--#.O21=:. ",
+".oooooO+++++++O ",
-".45<<>--....... ",
+".oooooO+OOOOO+O ",
-".6453<>----.    ",
+" .....O+++++++O ",
-"............    "
+"      OOOOOOOOO "
 };

contrib/samples/ogl/studio/bitmaps/preview.xpm

@@ -1,51 +1,26 @@
 /* XPM */
 static char *preview_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 30 1",
+"16 15 5 1",
-"1 c Black",
+"  c Black",
-"= c #97C4E7",
+". c None",
-"< c #FFFFFF",
+"X c Gray100",
-", c #69A1CF",
+"o c #808080",
-". c #5A89A6",
+"O c Cyan",
-"# c #3A749C",
-"+ c #538BB1",
-"> c #D1E5F5",
-"o c #6792AE",
-"% c #C3DDF1",
-"8 c #749BB5",
-"; c #619BC4",
-"X c #6B97B6",
-"@ c #4B82A8",
-"  c None",
-"O c #5F8FB0",
-"q c #84A5BB",
-": c #71A8D1",
-"- c #85BBE2",
-"9 c #EFF6FC",
-"7 c #F7FBFD",
-"6 c #FAFCFE",
-"2 c #7FA6C0",
-"5 c #C00000",
-"0 c #FDFDFE",
-"3 c #E2EFF8",
-"$ c #8EA9BC",
-"& c #B6D5EE",
-"* c #A5CCEA",
-"4 c #F4F9FD",
 /* pixels */
-"  ..XoO+@#$     ",
+"         .......",
-"  .%%&*=-;:;    ",
+" XXXXXXX  ......",
-"  .>>%&*=,<=X   ",
+" XXXXXXX . .....",
-"  $%%%1112<<=X  ",
+" XXXXXXX    ....",
-"  $3-1<<<1oXO+  ",
+" XXXXXXXXXX ....",
-"  $314<<<<1=-+  ",
+" XXXXXXX    ....",
-"  $31<<<<<1-=+  ",
+" XXXXXX o..o ...",
-"  $31<<<<<1&*O  ",
+" XXXXX oOO.oo ..",
-"  $3-1<<<51>%X  ",
+" XXXXX .O..o. ..",
-"  $367111551>8  ",
+" XXXXX ....o. ..",
-"  $3-----95518  ",
+" XXXXX o..Ooo ..",
-"  $3<067466551  ",
+" XXXXXX o..o o..",
-"  $3--------551 ",
+" XXXXXXX    o  .",
-"  $3<<<0666<<55 ",
+" XXXXXXXXXX .   ",
-"  $$$$$$$$$$q$  "
+"            ..  "
 };

contrib/samples/ogl/studio/bitmaps/print.xpm

@@ -1,56 +1,26 @@
 /* XPM */
 static char *print_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 35 1",
+"16 15 5 1",
-"y c #EDF2FB",
-"9 c #4E7FD0",
-"> c #B9CDED",
-"# c #3365B7",
-"r c #FFFFFF",
-"8 c #2C58A0",
-"X c #779DDB",
-"7 c #7FA2DD",
-"t c #3263B4",
-"q c #6E96D8",
-"= c #6992D7",
-"* c #D9E4F5",
-"0 c #356AC1",
-"& c #CBD9F1",
-"; c #97B4E3",
-"e c #3161B1",
 "  c None",
-"1 c #B5C9EB",
+". c Black",
-", c #7CA0DC",
+"X c Gray100",
-"4 c #487BCE",
+"o c #808000",
-"- c #4377CD",
+"O c Yellow",
-". c #5584D1",
-"6 c #3A70CA",
-"2 c #305FAC",
-"< c #5685D2",
-"w c #4075CC",
-"5 c #638ED5",
-"3 c #3467BC",
-"% c #2F5DA9",
-"o c #ECF1FA",
-": c #D6E1F4",
-"@ c #376EC9",
-"$ c #2D5AA5",
-"+ c #A2BCE6",
-"O c #CFDDF3",
 /* pixels */
-"   .XXXXXXXX    ",
+"                ",
-"   .oooooooX    ",
+"     .........  ",
-"   .OOOOOOOX    ",
+"    .XXXXXXXX.  ",
-"   .+++++++X    ",
+"    .X.....X.   ",
-" @@#$%%%%%$%@@  ",
+"   .XXXXXXXX.   ",
-"#&*=-=;:>,<#*&# ",
+"   .X.....X.... ",
-".11.2345.63#11. ",
+"  .XXXXXXXX. . .",
-"4;;;;;;;;;;;;;4 ",
+" .......... . ..",
-"677588888889776 ",
+".          . . .",
-"0qq60wwwwwweqq0 ",
+".............  .",
-"3553rrrrrrr$553 ",
+".      ooo  . . ",
-"3<<tyrrrrrr$<<3 ",
+".      OOO  ... ",
-"XXX%rrrrrrr$XXX ",
+"............. . ",
-"   3rrrrrrr$    ",
+" .         . .  ",
-"   #XXXXXXX@    "
+"  ...........   "
 };

contrib/samples/ogl/studio/bitmaps/redo.xpm

@@ -1,58 +1,25 @@
 /* XPM */
 static char *redo_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* width height num_colors chars_per_pixel */
-"16 15 37 1",
+"    16    15        3            1",
-"2 c #4E7FD0",
+/* colors */
-"i c #3365B7",
+". c #000080",
-"e c #8DADE1",
+"# c #c0c0c0",
-": c #3162B3",
+"a c #808080",
-", c #4A7CCE",
-"% c #779DDB",
-"6 c #7FA2DD",
-"0 c #6992D7",
-"3 c #6E96D8",
-"7 c #356AC1",
-". c #9BB7E5",
-"@ c #5886D2",
-"u c #BED0EE",
-"r c #C3D4EF",
-"5 c #85A7DF",
-"+ c #ADC4E9",
-"y c #DAE5F6",
-"  c None",
-"O c #487BCE",
-"t c #9FB9E5",
-"o c #254A87",
-"w c #AEC5EA",
-"q c #89A9DF",
-"8 c #98B5E4",
-"> c #3A70CA",
-"- c #3569BF",
-"& c #305FAC",
-"1 c #5D89D3",
-"= c #3366B9",
-"9 c #2E5CA8",
-"< c #638ED5",
-"4 c #3467BC",
-"X c #2F5DA9",
-"# c #2A5398",
-"$ c #376EC9",
-"* c #2D5AA5",
-"; c #8CACE0",
 /* pixels */
-"  .XoooO+       ",
+"################",
-" @o#####o$    @ ",
+"################",
-"%#&&*#*&&*#  @o ",
+"################",
-"X=-#@;@#=-:#$*# ",
+"################",
-"#>-@    #->-=># ",
+"###a....########",
-"*,>%     #>,,,# ",
+"##a.####..###.##",
-"*<1X     X,<<<* ",
+"##.#######.#..##",
-"@234;   #13333* ",
+"##.########...##",
-" X56X  $#7O155X ",
+"##.#######....##",
-" O2869    .0$*o ",
+"##a.#####.....##",
-"  :qwe9         ",
+"###.a###########",
-"   9.rt9        ",
+"################",
-"    9+y@u       ",
+"################",
-"     i$$        ",
+"################",
-"                "
+"################"
 };

contrib/samples/ogl/studio/bitmaps/save.xpm

@@ -1,42 +1,25 @@
 /* XPM */
 static char *save_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"16 15 21 1",
+"16 15 4 1",
-": c #AAC1E8",
+"  c None",
-"1 c #B9CDED",
+". c Black",
-"O c #FFFFFF",
+"X c #808000",
-"  c #2C58A0",
+"o c #808080",
-"* c #B0C6EA",
-"; c #2D59A3",
-"X c #1C3866",
-"= c #C3D4EF",
-"2 c #CBD9F1",
-"- c #DAE5F6",
-"# c #97B4E3",
-". c None",
-"$ c #274D8B",
-"& c #9FB9E5",
-"@ c #5584D1",
-"% c #82A5DE",
-"o c #3A70CA",
-"< c #A5BEE7",
-", c #D2DFF4",
-"+ c #3467BC",
-"> c #C0D1EE",
 /* pixels */
-"               .",
+"                ",
-" XoOOOOOOOOO+X .",
+" .............. ",
-" @oO#######O+@ .",
+" .X.        . . ",
-" @oOOOOOOOOO+@ .",
+" .X.        ... ",
-" @oO#######O+@ .",
+" .X.        .X. ",
-" @oOOOOOOOOO+@ .",
+" .X.        .X. ",
-" @@+++++++++@@ .",
+" .X.        .X. ",
-" @@@@@@@@@@@@@ .",
+" .X.        .X. ",
-" @@@$$$$$$$$@@ .",
+" .XX........oX. ",
-" @@$%%%&*=-O$@ .",
+" .XXXXXXXXXXXX. ",
-" @@$%X;;*=-O$@ .",
+" .XX.........X. ",
-" @@$%X;;:>,O$@ .",
+" .XX......  .X. ",
-" @@$%X;;<12O$@ .",
+" .XX......  .X. ",
-" @@$<<2OOOOO$@ .",
+" .XX......  .X. ",
-".             .."
+"  ............. "
 };

contrib/samples/ogl/studio/bitmaps/undo.xpm

@@ -1,58 +1,25 @@
 /* XPM */
 static char *undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* width height num_colors chars_per_pixel */
-"16 15 37 1",
+"    16    15        3            1",
-"4 c #4E7FD0",
+/* colors */
-"i c #3365B7",
+". c #000080",
-"q c #8DADE1",
+"# c #c0c0c0",
-"= c #3162B3",
+"a c #808080",
-", c #4A7CCE",
-"* c #779DDB",
-"7 c #7FA2DD",
-"8 c #6992D7",
-"2 c #6E96D8",
-"6 c #356AC1",
-"+ c #9BB7E5",
-"@ c #5886D2",
-"y c #BED0EE",
-"t c #C3D4EF",
-"5 c #85A7DF",
-". c #ADC4E9",
-"u c #DAE5F6",
-"  c None",
-"X c #487BCE",
-"r c #9FB9E5",
-"o c #254A87",
-"w c #AEC5EA",
-"e c #89A9DF",
-"0 c #98B5E4",
-"> c #3A70CA",
-"- c #3569BF",
-"& c #305FAC",
-"1 c #5D89D3",
-"; c #3366B9",
-"9 c #2E5CA8",
-"< c #638ED5",
-"3 c #3467BC",
-"O c #2F5DA9",
-"$ c #2A5398",
-"# c #376EC9",
-"% c #2D5AA5",
-": c #8CACE0",
 /* pixels */
-"      .XoooO+   ",
+"################",
-"@    #o$$$$$o@  ",
+"################",
-"o@  $%&&%$%&&$* ",
+"################",
-"$%#$=-;$@:@$-;O ",
+"################",
-"$>;->-$    @->$ ",
+"########....a###",
-"$,,,>$     *>,% ",
+"##.###..####.a##",
-"%<<<,O     O1<% ",
+"##..#.#######.##",
-"%22221$   :324@ ",
+"##...########.##",
-"O551X6$#  O75O  ",
+"##....#######.##",
-"o%#8+    9704X  ",
+"##.....#####.a##",
-"        9qwe=   ",
+"###########a.###",
-"       9rt+9    ",
+"################",
-"      y@u.9     ",
+"################",
-"       ##i      ",
+"################",
-"                "
+"################"
 };