use transparent icons and clear the DC before drawing them to fix the background of state icons appearance (part of #9591)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-14 19:15:19 +00:00
parent f379342915
commit a6aa377bb3
6 changed files with 668 additions and 673 deletions

View File

@@ -1,145 +1,145 @@
/* XPM */ /* XPM */
static const char *state1_xpm[] = { static const char *state1_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 123 2", "16 16 123 2",
"8. c #ADAF01", "8. c #ADAF01",
"n c #E5E804", "n c #E5E804",
"2. c #E5E806", "2. c #E5E806",
", c #FCFF00", ", c #FCFF00",
"R c #C4C601", "R c #C4C601",
"J c #E5E809", "J c #E5E809",
". c #FCFF05", ". c #FCFF05",
"*. c #D6D904", "*. c #D6D904",
"X c #FCFF13", "X c #FCFF13",
"6. c #A6A800", "6. c #A6A800",
"M c #EDF00E", "M c #EDF00E",
"$. c #A6A802", "$. c #A6A802",
" c #FFFFFF", " c None",
"H c #DEE104", "H c #DEE104",
"0 c #F5F802", "0 c #F5F802",
"o c #FCFF22", "o c #FCFF22",
"s c #EEF101", "s c #EEF101",
"t c #FAFC24", "t c #FAFC24",
"3. c #F3F506", "3. c #F3F506",
"_ c #FAFC27", "_ c #FAFC27",
"f c #EEF106", "f c #EEF106",
"} c #C8CB03", "} c #C8CB03",
"U c #FAFC32", "U c #FAFC32",
"' c #BEC000", "' c #BEC000",
"/ c #EEF113", "/ c #EEF113",
"E c #BEC002", "E c #BEC002",
"C c #FAFC36", "C c #FAFC36",
"l c #FAFC38", "l c #FAFC38",
"D c #D0D301", "D c #D0D301",
"5. c #AFB100", "5. c #AFB100",
"e c #F6F90E", "e c #F6F90E",
"[ c #AFB102", "[ c #AFB102",
"@. c #A0A200", "@. c #A0A200",
"j c #F6F91C", "j c #F6F91C",
"G c #D8DB03", "G c #D8DB03",
"> c #FEFF86", "> c #FEFF86",
") c #F6F91F", ") c #F6F91F",
": c #FEFF8D", ": c #FEFF8D",
"p c #FEFF8E", "p c #FEFF8E",
"1. c #C9CC03", "1. c #C9CC03",
"8 c #FEFF92", "8 c #FEFF92",
"v c #E0E301", "v c #E0E301",
".. c #EFF210", ".. c #EFF210",
"y c #FBFD35", "y c #FBFD35",
"4. c #F7FA02", "4. c #F7FA02",
"P c #F4F61C", "P c #F4F61C",
"F c #D1D402", "F c #D1D402",
"Z c #FBFD46", "Z c #FBFD46",
"o. c #F7FA18", "o. c #F7FA18",
"r c #F7FA19", "r c #F7FA19",
"! c #D9DC06", "! c #D9DC06",
"%. c #B8BA02", "%. c #B8BA02",
"g c #F0F30C", "g c #F0F30C",
"4 c #FCFE2F", "4 c #FCFE2F",
"b c #E1E402", "b c #E1E402",
"N c #F0F313", "N c #F0F313",
" . c #E1E408", " . c #E1E408",
"Y c #FCFE3A", "Y c #FCFE3A",
":. c #F8FB0A", ":. c #F8FB0A",
"B c #F5F71E", "B c #F5F71E",
"1 c #F8FB0B", "1 c #F8FB0B",
"5 c #FCFE43", "5 c #FCFE43",
"m c #E9EC08", "m c #E9EC08",
"&. c #C8CA03", "&. c #C8CA03",
"u c #FCFE4A", "u c #FCFE4A",
"^ c #E9EC0C", "^ c #E9EC0C",
"0. c #DADD01", "0. c #DADD01",
"A c #FCFE54", "A c #FCFE54",
"z c #FCFE5D", "z c #FCFE5D",
";. c #F1F40D", ";. c #F1F40D",
"=. c #E2E507", "=. c #E2E507",
"~ c #E2E509", "~ c #E2E509",
"< c #F9FC05", "< c #F9FC05",
"= c #FDFF39", "= c #FDFF39",
"O c #FDFF3C", "O c #FDFF3C",
"T c #FDFF3F", "T c #FDFF3F",
"2 c #F9FC13", "2 c #F9FC13",
"] c #A3A501", "] c #A3A501",
"- c #FDFF50", "- c #FDFF50",
"3 c #F9FC1F", "3 c #F9FC1F",
"+. c #BABC00", "+. c #BABC00",
"L c #EFF114", "L c #EFF114",
"+ c #FDFF56", "+ c #FDFF56",
"q c #F2F504", "q c #F2F504",
"S c #FDFF59", "S c #FDFF59",
"#. c #949601", "#. c #949601",
"6 c #FDFF5C", "6 c #FDFF5C",
"$ c #FDFF5F", "$ c #FDFF5F",
"9 c #FDFF61", "9 c #FDFF61",
"@ c #FDFF63", "@ c #FDFF63",
"# c #FDFF65", "# c #FDFF65",
"c c #FDFF67", "c c #FDFF67",
"a c #FDFF68", "a c #FDFF68",
"9. c #C2C402", "9. c #C2C402",
"{ c #BDC003", "{ c #BDC003",
"; c #FDFF6C", "; c #FDFF6C",
"x c #FDFF70", "x c #FDFF70",
"7 c #FDFF76", "7 c #FDFF76",
"i c #FDFF77", "i c #FDFF77",
"I c #F7F925", "I c #F7F925",
"V c #F7F927", "V c #F7F927",
"<. c #8D8F01", "<. c #8D8F01",
"-. c #EBEE0A", "-. c #EBEE0A",
"K c #EBEE0C", "K c #EBEE0C",
"7. c #A4A600", "7. c #A4A600",
"w. c #F3F600", "w. c #F3F600",
",. c #959700", ",. c #959700",
"h c #F3F612", "h c #F3F612",
"X. c #F3F615", "X. c #F3F615",
"( c #F3F619", "( c #F3F619",
"| c #D5D804", "| c #D5D804",
"% c #FBFE0B", "% c #FBFE0B",
"d c #ECEF03", "d c #ECEF03",
"O. c #FBFE13", "O. c #FBFE13",
"k c #F8FA27", "k c #F8FA27",
"W c #C6C902", "W c #C6C902",
"& c #FBFE18", "& c #FBFE18",
"` c #FBFE23", "` c #FBFE23",
"* c #FBFE24", "* c #FBFE24",
"w c #F4F709", "w c #F4F709",
"Q c #CED103", "Q c #CED103",
"q. c #EAEC01", "q. c #EAEC01",
">. c #ADAF00", ">. c #ADAF00",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" . X o O + @ # $ ", " . X o O + @ # $ ",
" . % & * = - ; : > ; ", " . % & * = - ; : > ; ",
" , < 1 2 3 4 5 6 7 8 > 9 ", " , < 1 2 3 4 5 6 7 8 > 9 ",
" 0 q w e r t y u $ i p a ", " 0 q w e r t y u $ i p a ",
" s d f g h j k l u z x c ", " s d f g h j k l u z x c ",
" v b n m M N B V C Z A S ", " v b n m M N B V C Z A S ",
" D F G H J K L P I U Y T ", " D F G H J K L P I U Y T ",
" R E W Q ! ~ ^ / ( ) _ ` ", " R E W Q ! ~ ^ / ( ) _ ` ",
" ' ] [ { } | .^ ..X.o.O. ", " ' ] [ { } | .^ ..X.o.O. ",
" +.@.#.$.%.&.*.=.-.;.:.. ", " +.@.#.$.%.&.*.=.-.;.:.. ",
" >.,.<.] %.1.G 2.3.4. ", " >.,.<.] %.1.G 2.3.4. ",
" 5.6.7.8.9.0.q.w. ", " 5.6.7.8.9.0.q.w. ",
" ", " ",
" " " "
}; };

View File

@@ -1,144 +1,144 @@
/* XPM */ /* XPM */
static const char *state2_xpm[] = { static const char *state2_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 122 2", "16 16 122 2",
"4. c #54AF2C", "4. c #54AF2C",
"9 c #95CF7C", "9 c #95CF7C",
"K c #56A932", "K c #56A932",
"~ c #51A22E", "~ c #51A22E",
"Z c #82C665", "Z c #82C665",
"0. c #4FA529", "0. c #4FA529",
"! c #4C9B2A", "! c #4C9B2A",
"[ c #3C7C1F", "[ c #3C7C1F",
"' c #3F8620", "' c #3F8620",
"x c #9FD488", "x c #9FD488",
"6. c #37751C", "6. c #37751C",
" c #FFFFFF", " c None",
"A c #8CCB71", "A c #8CCB71",
"# c #98D07F", "# c #98D07F",
"5. c #3A7C1E", "5. c #3A7C1E",
"3 c #68B944", "3 c #68B944",
"R c #428A22", "R c #428A22",
"X c #61B83B", "X c #61B83B",
"| c #4A9827", "| c #4A9827",
"*. c #4A9828", "*. c #4A9828",
"V c #6DBA4B", "V c #6DBA4B",
"@ c #96D07D", "@ c #96D07D",
"> c #AEDA9A", "> c #AEDA9A",
"s c #50A92A", "s c #50A92A",
"/ c #5CAE38", "/ c #5CAE38",
"3. c #55AD2F", "3. c #55AD2F",
"} c #458E25", "} c #458E25",
"B c #66B643", "B c #66B643",
"& c #64B93F", "& c #64B93F",
"v c #4B9F27", "v c #4B9F27",
".. c #5AAE36", ".. c #5AAE36",
"$. c #38761E", "$. c #38761E",
"0 c #53AD2B", "0 c #53AD2B",
"X. c #5FB23B", "X. c #5FB23B",
"c c #99D181", "c c #99D181",
"U c #75BF54", "U c #75BF54",
"f c #53AA2E", "f c #53AA2E",
"= c #7AC35A", "= c #7AC35A",
"m c #53A72E", "m c #53A72E",
"< c #56B12E", "< c #56B12E",
"o. c #62B63E", "o. c #62B63E",
"% c #5BB534", "% c #5BB534",
"7 c #A3D68D", "7 c #A3D68D",
"N c #5DAF39", "N c #5DAF39",
"( c #62B33E", "( c #62B33E",
"S c #90CD75", "S c #90CD75",
"e c #5BB236", "e c #5BB236",
") c #67B744", ") c #67B744",
"2 c #60B63A", "2 c #60B63A",
"b c #4CA028", "b c #4CA028",
":. c #59B232", ":. c #59B232",
"Q c #479326", "Q c #479326",
"7. c #37741C", "7. c #37741C",
"w c #57AF31", "w c #57AF31",
"G c #4A9A27", "G c #4A9A27",
"8. c #428923", "8. c #428923",
"_ c #6DBC4B", "_ c #6DBC4B",
"l c #79C159", "l c #79C159",
"T c #7EC55F", "T c #7EC55F",
"- c #8ACA6E", "- c #8ACA6E",
"1 c #5AB333", "1 c #5AB333",
"@. c #35711B", "@. c #35711B",
"H c #4D9E29", "H c #4D9E29",
"o c #6BBC47", "o c #6BBC47",
"` c #6BBC48", "` c #6BBC48",
": c #B3DDA0", ": c #B3DDA0",
"p c #B3DDA1", "p c #B3DDA1",
"y c #77C157", "y c #77C157",
"E c #408622", "E c #408622",
"$ c #94CF7A", "$ c #94CF7A",
"-. c #55A930", "-. c #55A930",
"I c #6BB949", "I c #6BB949",
"=. c #50A22C", "=. c #50A22C",
" . c #50A22D", " . c #50A22D",
"q c #53AC2D", "q c #53AC2D",
"W c #438D23", "W c #438D23",
"5 c #81C663", "5 c #81C663",
"<. c #306419", "<. c #306419",
"g c #58AD33", "g c #58AD33",
"8 c #B6DEA4", "8 c #B6DEA4",
"q. c #51AC29", "q. c #51AC29",
"h c #5DB138", "h c #5DB138",
"+. c #3E8320", "+. c #3E8320",
"9. c #499B26", "9. c #499B26",
"L c #5DAE39", "L c #5DAE39",
"{ c #418722", "{ c #418722",
"&. c #448E24", "&. c #448E24",
"+ c #8ECC72", "+ c #8ECC72",
"j c #65B641", "j c #65B641",
"a c #9AD181", "a c #9AD181",
". c #57B42F", ". c #57B42F",
"F c #479525", "F c #479525",
";. c #59AE34", ";. c #59AE34",
"Y c #7BC35B", "Y c #7BC35B",
"n c #4FA32A", "n c #4FA32A",
"r c #63B63F", "r c #63B63F",
"] c #37731C", "] c #37731C",
"i c #A4D68E", "i c #A4D68E",
"u c #85C868", "u c #85C868",
">. c #3A7A1E", ">. c #3A7A1E",
",. c #326919", ",. c #326919",
"k c #6DBB4B", "k c #6DBB4B",
"#. c #32691A", "#. c #32691A",
"J c #52A42E", "J c #52A42E",
"1. c #458F25", "1. c #458F25",
"t c #6BBB49", "t c #6BBB49",
"C c #77C057", "C c #77C057",
"O c #7CC45D", "O c #7CC45D",
"2. c #50A42C", "2. c #50A42C",
"^ c #55A831", "^ c #55A831",
"P c #64B441", "P c #64B441",
"6 c #92CE77", "6 c #92CE77",
"z c #92CE78", "z c #92CE78",
"D c #469324", "D c #469324",
"M c #58AC34", "M c #58AC34",
"4 c #73C052", "4 c #73C052",
"%. c #3E8221", "%. c #3E8221",
"d c #51A82B", "d c #51A82B",
", c #54B22B", ", c #54B22B",
"O. c #60B73A", "O. c #60B73A",
"; c #9CD385", "; c #9CD385",
"* c #6CBC49", "* c #6CBC49",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" . X o O + @ # $ ", " . X o O + @ # $ ",
" . % & * = - ; : > ; ", " . % & * = - ; : > ; ",
" , < 1 2 3 4 5 6 7 8 > 9 ", " , < 1 2 3 4 5 6 7 8 > 9 ",
" 0 q w e r t y u $ i p a ", " 0 q w e r t y u $ i p a ",
" s d f g h j k l u z x c ", " s d f g h j k l u z x c ",
" v b n m M N B V C Z A S ", " v b n m M N B V C Z A S ",
" D F G H J K L P I U Y T ", " D F G H J K L P I U Y T ",
" R E W Q ! ~ ^ / ( ) _ ` ", " R E W Q ! ~ ^ / ( ) _ ` ",
" ' ] [ { } | .^ ..X.o.O. ", " ' ] [ { } | .^ ..X.o.O. ",
" +.@.#.$.%.&.*.=.-.;.:.. ", " +.@.#.$.%.&.*.=.-.;.:.. ",
" >.,.<.] %.1.G 2.3.4. ", " >.,.<.] %.1.G 2.3.4. ",
" 5.6.7.>.8.9.0.q. ", " 5.6.7.>.8.9.0.q. ",
" ", " ",
" " " "
}; };

View File

@@ -1,142 +1,142 @@
/* XPM */ /* XPM */
static const char *state3_xpm[] = { static const char *state3_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 120 2", "16 16 120 2",
"7 c #E48D8D", "7 c #E48D8D",
"> c #E79A9A", "> c #E79A9A",
"& c #D03F3F", "& c #D03F3F",
"=. c #C63434", "=. c #C63434",
"F c #B02727", "F c #B02727",
",. c #A42525", ",. c #A42525",
". c #CD2F2F", ". c #CD2F2F",
"s c #C12A2A", "s c #C12A2A",
";. c #8C1E1E", ";. c #8C1E1E",
"5 c #D96363", "5 c #D96363",
"-. c #CB3232", "-. c #CB3232",
" . c #C93B3B", " . c #C93B3B",
"0 c #C62B2B", "0 c #C62B2B",
"$ c #DF7A7A", "$ c #DF7A7A",
"t c #D14949", "t c #D14949",
" c #FFFFFF", " c None",
"o. c #962020", "o. c #962020",
"&. c #B82C2C", "&. c #B82C2C",
"p c #E8A1A1", "p c #E8A1A1",
"P c #CF4949", "P c #CF4949",
"2. c #C92C2C", "2. c #C92C2C",
"f c #C22E2E", "f c #C22E2E",
"= c #D75A5A", "= c #D75A5A",
"^ c #C53838", "^ c #C53838",
"e c #CA3636", "e c #CA3636",
"d c #C02B2B", "d c #C02B2B",
"y c #D55757", "y c #D55757",
"X. c #CF3A3A", "X. c #CF3A3A",
"n c #BE2E2E", "n c #BE2E2E",
"9. c #C52929", "9. c #C52929",
"E c #A12323", "E c #A12323",
"#. c #952121", "#. c #952121",
"2 c #CD3A3A", "2 c #CD3A3A",
"z c #DE7878", "z c #DE7878",
"R c #9A2222", "R c #9A2222",
"A c #DE7575", "A c #DE7575",
"3 c #D04444", "3 c #D04444",
"M c #C63939", "M c #C63939",
"% c #CD3434", "% c #CD3434",
"O. c #821B1B", "O. c #821B1B",
"X c #D03B3B", "X c #D03B3B",
"6. c #9D2323", "6. c #9D2323",
"9 c #DF7C7C", "9 c #DF7C7C",
"Y c #D95F5F", "Y c #D95F5F",
"5. c #851C1C", "5. c #851C1C",
"$. c #A22424", "$. c #A22424",
">. c #721919", ">. c #721919",
": c #E8A0A0", ": c #E8A0A0",
"B c #CF4B4B", "B c #CF4B4B",
"Q c #B12A2A", "Q c #B12A2A",
"8. c #BD2929", "8. c #BD2929",
"w c #C73131", "w c #C73131",
"/ c #CA3E3E", "/ c #CA3E3E",
"<. c #BB2C2C", "<. c #BB2C2C",
"*. c #C03030", "*. c #C03030",
"@ c #E07D7D", "@ c #E07D7D",
"[ c #A32525", "[ c #A32525",
"l c #D55959", "l c #D55959",
"8 c #E9A4A4", "8 c #E9A4A4",
"* c #D24949", "* c #D24949",
"W c #A82626", "W c #A82626",
"r c #CD3F3F", "r c #CD3F3F",
"m c #C33434", "m c #C33434",
"{ c #AD2727", "{ c #AD2727",
"h c #C83838", "h c #C83838",
"O c #D85D5D", "O c #D85D5D",
"6 c #DE7777", "6 c #DE7777",
"] c #8E1F1F", "] c #8E1F1F",
"a c #E18181", "a c #E18181",
"i c #E48E8E", "i c #E48E8E",
"T c #9F2222", "T c #9F2222",
"@. c #871E1E", "@. c #871E1E",
"G c #B52929", "G c #B52929",
"1. c #C62F2F", "1. c #C62F2F",
"o c #D34747", "o c #D34747",
"1 c #CB3333", "1 c #CB3333",
"~ c #BF3131", "~ c #BF3131",
"Z c #DC7171", "Z c #DC7171",
"S c #A92424", "S c #A92424",
"b c #BA2A2A", "b c #BA2A2A",
"%. c #AE2828", "%. c #AE2828",
"- c #DC6E6E", "- c #DC6E6E",
":. c #791919", ":. c #791919",
"x c #E28888", "x c #E28888",
"V c #D45757", "V c #D45757",
"N c #CC4343", "N c #CC4343",
"} c #B82D2D", "} c #B82D2D",
"; c #E28585", "; c #E28585",
"I c #D45454", "I c #D45454",
"U c #D75B5B", "U c #D75B5B",
"u c #DA6868", "u c #DA6868",
"7. c #B12626", "7. c #B12626",
"K c #C53939", "K c #C53939",
"H c #BB2E2E", "H c #BB2E2E",
"J c #C03232", "J c #C03232",
"+ c #DD7272", "+ c #DD7272",
"c c #B62727", "c c #B62727",
"D c #AA2525", "D c #AA2525",
"| c #C53636", "| c #C53636",
"# c #E07F7F", "# c #E07F7F",
"g c #C53333", "g c #C53333",
"4. c #861C1C", "4. c #861C1C",
") c #D24B4B", ") c #D24B4B",
"( c #CD4444", "( c #CD4444",
"! c #B92E2E", "! c #B92E2E",
"C c #D86565", "C c #D86565",
"_ c #D24848", "_ c #D24848",
", c #CC2B2B", ", c #CC2B2B",
"j c #CD4141", "j c #CD4141",
"q c #C52D2D", "q c #C52D2D",
"4 c #D55252", "4 c #D55252",
".. c #CD3E3E", ".. c #CD3E3E",
"' c #841C1C", "' c #841C1C",
"k c #D04B4B", "k c #D04B4B",
"+. c #781A1A", "+. c #781A1A",
"< c #CA2E2E", "< c #CA2E2E",
"L c #CB4141", "L c #CB4141",
"` c #9A2020", "` c #9A2020",
"3. c #8E1E1E", "3. c #8E1E1E",
"v c #B72828", "v c #B72828",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" . X o O + @ # $ ", " . X o O + @ # $ ",
" . % & * = - ; : > ; ", " . % & * = - ; : > ; ",
" , < 1 2 3 4 5 6 7 8 > 9 ", " , < 1 2 3 4 5 6 7 8 > 9 ",
" 0 q w e r t y u $ i p a ", " 0 q w e r t y u $ i p a ",
" s d f g h j k l u z x a ", " s d f g h j k l u z x a ",
" c v b n m M N B V C Z A ", " c v b n m M N B V C Z A ",
" S D F G H J K L P I U Y ", " S D F G H J K L P I U Y ",
" T R E W Q ! ~ ^ / ( ) _ ", " T R E W Q ! ~ ^ / ( ) _ ",
" ` ' ] R [ { } ~ | ...X. ", " ` ' ] R [ { } ~ | ...X. ",
" o.O.+.@.#.$.%.&.*.=.-.. ", " o.O.+.@.#.$.%.&.*.=.-.. ",
" ;.:.>.' #.,.F <.1.2. ", " ;.:.>.' #.,.F <.1.2. ",
" 3.4.5.;.6.7.8.9. ", " 3.4.5.;.6.7.8.9. ",
" ", " ",
" " " "
}; };

View File

@@ -1,145 +1,145 @@
/* XPM */ /* XPM */
static const char *state4_xpm[] = { static const char *state4_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 123 2", "16 16 123 2",
"h c #3875C8", "h c #3875C8",
"D c #245CA9", "D c #245CA9",
"&. c #2459A2", "&. c #2459A2",
"#. c #1A4278", "#. c #1A4278",
"Z c #6596D8", "Z c #6596D8",
"w c #3171C7", "w c #3171C7",
"v c #2763B6", "v c #2763B6",
"=. c #2C67B8", "=. c #2C67B8",
"| c #2760AD", "| c #2760AD",
".. c #3672C5", ".. c #3672C5",
" c #FFFFFF", " c None",
"U c #548AD4", "U c #548AD4",
"s c #2A6AC1", "s c #2A6AC1",
"% c #3475CD", "% c #3475CD",
";. c #3472C6", ";. c #3472C6",
"n c #2A67BA", "n c #2A67BA",
"6 c #77A3DE", "6 c #77A3DE",
"3. c #2F6EC6", "3. c #2F6EC6",
"o. c #3E7ACD", "o. c #3E7ACD",
"F c #255DAA", "F c #255DAA",
"} c #255AA3", "} c #255AA3",
"` c #4882D2", "` c #4882D2",
"1. c #255AA4", "1. c #255AA4",
"8 c #A4C1E9", "8 c #A4C1E9",
" . c #2D68B8", " . c #2D68B8",
"b c #2864B7", "b c #2864B7",
"*. c #2861AE", "*. c #2861AE",
"# c #7FA8E0", "# c #7FA8E0",
"P c #417BCB", "P c #417BCB",
"V c #4B83CF", "V c #4B83CF",
"k c #4B83D0", "k c #4B83D0",
"8. c #1E4D8C", "8. c #1E4D8C",
"5. c #1E4D8E", "5. c #1E4D8E",
"= c #5A8FD7", "= c #5A8FD7",
"T c #5F93D9", "T c #5F93D9",
"$. c #1E4A87", "$. c #1E4A87",
"- c #6E9CDC", "- c #6E9CDC",
"0. c #2661B1", "0. c #2661B1",
"r c #3F7BCD", "r c #3F7BCD",
"3 c #447FD0", "3 c #447FD0",
"* c #4983D2", "* c #4983D2",
"w. c #296BC5", "w. c #296BC5",
"q. c #2968BD", "q. c #2968BD",
"1 c #3373CB", "1 c #3373CB",
"f c #2E6CC2", "f c #2E6CC2",
"/ c #3874C5", "/ c #3874C5",
"[ c #1F4E8E", "[ c #1F4E8E",
"^ c #316DBF", "^ c #316DBF",
"e c #3674CA", "e c #3674CA",
"{ c #22559A", "{ c #22559A",
"x c #88AEE2", "x c #88AEE2",
"7 c #8DB2E4", "7 c #8DB2E4",
"l c #598DD5", "l c #598DD5",
"5 c #6395D9", "5 c #6395D9",
"p c #A1BFE8", "p c #A1BFE8",
"9 c #7CA6DF", "9 c #7CA6DF",
"! c #2A63B1", "! c #2A63B1",
"a c #81AAE1", "a c #81AAE1",
"( c #3E79CA", "( c #3E79CA",
"B c #437DCC", "B c #437DCC",
"+. c #205296", "+. c #205296",
"4 c #5289D5", "4 c #5289D5",
"> c #9ABBE7", "> c #9ABBE7",
"q c #2D6DC5", "q c #2D6DC5",
"K c #326EC0", "K c #326EC0",
"9. c #23569D", "9. c #23569D",
">. c #1E4C8C", ">. c #1E4C8C",
",. c #194279", ",. c #194279",
"<. c #193F72", "<. c #193F72",
"0 c #2B6DC6", "0 c #2B6DC6",
"d c #2B6AC0", "d c #2B6AC0",
"O. c #3A79CF", "O. c #3A79CF",
"z c #78A3DE", "z c #78A3DE",
"@ c #7DA7E0", "@ c #7DA7E0",
"Q c #265DA8", "Q c #265DA8",
") c #447ECD", ") c #447ECD",
"I c #4982CF", "I c #4982CF",
"t c #4982D1", "t c #4982D1",
"6. c #1C4986", "6. c #1C4986",
"m c #2E6BBE", "m c #2E6BBE",
"H c #2964B5", "H c #2964B5",
"~ c #2E68B9", "~ c #2E68B9",
"o c #4782D3", "o c #4782D3",
"; c #85ACE2", "; c #85ACE2",
"Y c #5B8FD7", "Y c #5B8FD7",
"4. c #2C6EC9", "4. c #2C6EC9",
"X c #3B7AD0", "X c #3B7AD0",
"2. c #2C68BB", "2. c #2C68BB",
"G c #2761B0", "G c #2761B0",
"X. c #3B77C9", "X. c #3B77C9",
"R c #22579F", "R c #22579F",
"E c #22549A", "E c #22549A",
". c #2F72CD", ". c #2F72CD",
"u c #6898DA", "u c #6898DA",
"+ c #72A0DD", "+ c #72A0DD",
"M c #3470C3", "M c #3470C3",
"L c #3974C5", "L c #3974C5",
"N c #3974C6", "N c #3974C6",
"' c #20549A", "' c #20549A",
"c c #81A9E1", "c c #81A9E1",
"@. c #1B4782", "@. c #1B4782",
"C c #578CD4", "C c #578CD4",
"y c #578CD5", "y c #578CD5",
":. c #3273CB", ":. c #3273CB",
"S c #75A1DE", "S c #75A1DE",
"$ c #7AA5DF", "$ c #7AA5DF",
"j c #417CCD", "j c #417CCD",
"W c #2358A1", "W c #2358A1",
"_ c #4B84D2", "_ c #4B84D2",
"i c #8EB2E4", "i c #8EB2E4",
", c #2B6FCC", ", c #2B6FCC",
"-. c #306DC0", "-. c #306DC0",
"2 c #3A78CD", "2 c #3A78CD",
"& c #3F7CD0", "& c #3F7CD0",
"%. c #215295", "%. c #215295",
"] c #1C4884", "] c #1C4884",
"7. c #1C4885", "7. c #1C4885",
"O c #5D91D8", "O c #5D91D8",
": c #A0BFE8", ": c #A0BFE8",
"< c #2E70CA", "< c #2E70CA",
"A c #719EDC", "A c #719EDC",
"g c #3371C5", "g c #3371C5",
"J c #2E6ABB", "J c #2E6ABB",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" . X o O + @ # $ ", " . X o O + @ # $ ",
" . % & * = - ; : > ; ", " . % & * = - ; : > ; ",
" , < 1 2 3 4 5 6 7 8 > 9 ", " , < 1 2 3 4 5 6 7 8 > 9 ",
" 0 q w e r t y u $ i p a ", " 0 q w e r t y u $ i p a ",
" s d f g h j k l u z x c ", " s d f g h j k l u z x c ",
" v b n m M N B V C Z A S ", " v b n m M N B V C Z A S ",
" D F G H J K L P I U Y T ", " D F G H J K L P I U Y T ",
" R E W Q ! ~ ^ / ( ) _ ` ", " R E W Q ! ~ ^ / ( ) _ ` ",
" ' ] [ { } | .^ ..X.o.O. ", " ' ] [ { } | .^ ..X.o.O. ",
" +.@.#.$.%.&.*.=.-.;.:.. ", " +.@.#.$.%.&.*.=.-.;.:.. ",
" >.,.<.] %.1.G 2.3.4. ", " >.,.<.] %.1.G 2.3.4. ",
" 5.6.7.8.9.0.q.w. ", " 5.6.7.8.9.0.q.w. ",
" ", " ",
" " " "
}; };

View File

@@ -1,85 +1,85 @@
/* XPM */ /* XPM */
static const char *state5_xpm[] = { static const char *state5_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 63 1", "16 16 63 1",
", c Black", ", c Black",
"z c #1E1E1E", "z c #1E1E1E",
"O c #3C3C3C", "O c #3C3C3C",
"l c #080808", "l c #080808",
"w c #353535", "w c #353535",
" c #FFFFFF", " c None",
"u c #010101", "u c #010101",
"C c #101010", "C c #101010",
"< c #1F1F1F", "< c #1F1F1F",
"9 c #090909", "9 c #090909",
"& c #181818", "& c #181818",
"f c #272727", "f c #272727",
"x c #363636", "x c #363636",
"v c #545454", "v c #545454",
"@ c #636363", "@ c #636363",
"7 c #020202", "7 c #020202",
"1 c #2F2F2F", "1 c #2F2F2F",
"3 c #5C5C5C", "3 c #5C5C5C",
"S c #0A0A0A", "S c #0A0A0A",
"q c #191919", "q c #191919",
"c c #464646", "c c #464646",
"i c #030303", "i c #030303",
"s c #121212", "s c #121212",
"B c #3F3F3F", "B c #3F3F3F",
"h c #5D5D5D", "h c #5D5D5D",
"; c #6C6C6C", "; c #6C6C6C",
"% c #0B0B0B", "% c #0B0B0B",
"g c #383838", "g c #383838",
"+ c #565656", "+ c #565656",
"# c #656565", "# c #656565",
"5 c #929292", "5 c #929292",
"8 c #040404", "8 c #040404",
"X c #131313", "X c #131313",
"o c #222222", "o c #222222",
"a c #0C0C0C", "a c #0C0C0C",
"= c #393939", "= c #393939",
". c #050505", ". c #050505",
"n c #141414", "n c #141414",
"V c #232323", "V c #232323",
"M c #323232", "M c #323232",
"- c #505050", "- c #505050",
"$ c #5F5F5F", "$ c #5F5F5F",
"D c #0D0D0D", "D c #0D0D0D",
"d c #1C1C1C", "d c #1C1C1C",
"N c #3A3A3A", "N c #3A3A3A",
"k c #676767", "k c #676767",
"4 c #767676", "4 c #767676",
"p c #060606", "p c #060606",
"Z c #151515", "Z c #151515",
"* c #242424", "* c #242424",
": c #8D8D8D", ": c #8D8D8D",
"0 c #0E0E0E", "0 c #0E0E0E",
"e c #4A4A4A", "e c #4A4A4A",
"b c #595959", "b c #595959",
"y c #686868", "y c #686868",
"r c #777777", "r c #777777",
"> c #868686", "> c #868686",
"A c #070707", "A c #070707",
"m c #252525", "m c #252525",
"2 c #434343", "2 c #434343",
"6 c #616161", "6 c #616161",
"j c #707070", "j c #707070",
"t c #8E8E8E", "t c #8E8E8E",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" .XoO+@#$ ", " .XoO+@#$ ",
" .%&*=-;:>; ", " .%&*=-;:>; ",
" ,.%X<12345>6 ", " ,.%X<12345>6 ",
" 7890q*we$rty ", " 7890q*we$rty ",
" uipasdfgehjk ", " uipasdfgehjk ",
" u78l0Xzfxcvb ", " u78l0Xzfxcvb ",
" u7i89andmMNB ", " u7i89andmMNB ",
" u77ip9aXq<fV ", " u77ip9aXq<fV ",
" ,u7ii8laCZ&X ", " ,u7ii8laCZ&X ",
" ,,u77i8ASDS. ", " ,,u77i8ASDS. ",
" ,,uu7iipp7 ", " ,,uu7iipp7 ",
" ,,,u7uu, ", " ,,,u7uu, ",
" ", " ",
" " " "
}; };

View File

@@ -925,21 +925,15 @@ void MyTreeCtrl::CreateStateImageList(bool del)
} }
else else
{ {
#if 0 wxRendererNative& renderer = wxRendererNative::Get();
int width = ::GetSystemMetrics(SM_CXMENUCHECK),
height = ::GetSystemMetrics(SM_CYMENUCHECK); wxSize size(renderer.GetCheckBoxSize(this));
#else
int width = 16;
int height = 16;
#endif
// make an state checkbox image list // make an state checkbox image list
states = new wxImageList(width, height, true); states = new wxImageList(size.GetWidth(), size.GetHeight(), true);
wxBitmap checkBmp(width, height); wxBitmap checkBmp(size.GetWidth(), size.GetHeight());
wxRect rect (0, 0, width, height); wxRect rect(size);
wxRendererNative& renderer = wxRendererNative::Get();
// create no checked image // create no checked image
{ {
@@ -955,6 +949,7 @@ void MyTreeCtrl::CreateStateImageList(bool del)
// create checked image // create checked image
{ {
wxMemoryDC memDC(checkBmp); wxMemoryDC memDC(checkBmp);
memDC.Clear();
renderer.DrawCheckBox(this, memDC, rect, wxCONTROL_CHECKED); renderer.DrawCheckBox(this, memDC, rect, wxCONTROL_CHECKED);
} }