diff --git a/samples/univ/bricks.xpm b/samples/univ/bricks.xpm new file mode 100644 index 0000000000..0ebfc1cd3f --- /dev/null +++ b/samples/univ/bricks.xpm @@ -0,0 +1,362 @@ +/* XPM */ +static char *bricks_xpm[] = { +/* columns rows colors chars-per-pixel */ +"100 100 256 2", +" c Gray0", +". c #010101010101", +"X c #020202020202", +"o c Gray1", +"O c #040404040404", +"+ c Gray2", +"@ c #060606060606", +"# c #070707070707", +"$ c Gray3", +"% c #090909090909", +"& c Gray4", +"* c #0b0b0b0b0b0b", +"= c #0c0c0c0c0c0c", +"- c Gray5", +"; c #0e0e0e0e0e0e", +": c Gray6", +"> c #101010101010", +", c #111111111111", +"< c Gray7", +"1 c #131313131313", +"2 c Gray8", +"3 c #151515151515", +"4 c #161616161616", +"5 c Gray9", +"6 c #181818181818", +"7 c #191919191919", +"8 c Gray10", +"9 c #1b1b1b1b1b1b", +"0 c Gray11", +"q c #1d1d1d1d1d1d", +"w c #1e1e1e1e1e1e", +"e c Gray12", +"r c #202020202020", +"t c Gray13", +"y c #222222222222", +"u c #232323232323", +"i c Gray14", +"p c #252525252525", +"a c Gray15", +"s c #272727272727", +"d c #282828282828", +"f c Gray16", +"g c #2a2a2a2a2a2a", +"h c Gray17", +"j c #2c2c2c2c2c2c", +"k c #2d2d2d2d2d2d", +"l c Gray18", +"z c #2f2f2f2f2f2f", +"x c Gray19", +"c c #313131313131", +"v c #323232323232", +"b c Gray20", +"n c #343434343434", +"m c #353535353535", +"M c Gray21", +"N c #373737373737", +"B c Gray22", +"V c #393939393939", +"C c #3a3a3a3a3a3a", +"Z c Gray23", +"A c #3c3c3c3c3c3c", +"S c Gray24", +"D c #3e3e3e3e3e3e", +"F c #3f3f3f3f3f3f", +"G c Gray25", +"H c #414141414141", +"J c Gray26", +"K c #434343434343", +"L c #444444444444", +"P c Gray27", +"I c #464646464646", +"U c Gray28", +"Y c #484848484848", +"T c #494949494949", +"R c Gray29", +"E c #4b4b4b4b4b4b", +"W c #4c4c4c4c4c4c", +"Q c Gray30", +"! c #4e4e4e4e4e4e", +"~ c Gray31", +"^ c #505050505050", +"/ c #515151515151", +"( c Gray32", +") c #535353535353", +"_ c Gray33", +"` c #555555555555", +"' c #565656565656", +"] c Gray34", +"[ c #585858585858", +"{ c Gray35", +"} c #5a5a5a5a5a5a", +"| c #5b5b5b5b5b5b", +" . c Gray36", +".. c #5d5d5d5d5d5d", +"X. c Gray37", +"o. c #5f5f5f5f5f5f", +"O. c #606060606060", +"+. c Gray38", +"@. c #626262626262", +"#. c Gray39", +"$. c #646464646464", +"%. c #656565656565", +"&. c Gray40", +"*. c #676767676767", +"=. c #686868686868", +"-. c Gray41", +";. c #6a6a6a6a6a6a", +":. c Gray42", +">. c #6c6c6c6c6c6c", +",. c #6d6d6d6d6d6d", +"<. c Gray43", +"1. c #6f6f6f6f6f6f", +"2. c Gray44", +"3. c #717171717171", +"4. c #727272727272", +"5. c Gray45", +"6. c #747474747474", +"7. c Gray46", +"8. c #767676767676", +"9. c #777777777777", +"0. c Gray47", +"q. c #797979797979", +"w. c Gray48", +"e. c #7b7b7b7b7b7b", +"r. c #7c7c7c7c7c7c", +"t. c Gray49", +"y. c Gray", +"u. c Gray50", +"i. c #808080808080", +"p. c #818181818181", +"a. c Gray51", +"s. c #838383838383", +"d. c #848484848484", +"f. c Gray52", +"g. c #868686868686", +"h. c Gray53", +"j. c #888888888888", +"k. c #898989898989", +"l. c Gray54", +"z. c #8b8b8b8b8b8b", +"x. c Gray55", +"c. c #8d8d8d8d8d8d", +"v. c #8e8e8e8e8e8e", +"b. c Gray56", +"n. c #909090909090", +"m. c Gray57", +"M. c #929292929292", +"N. c #939393939393", +"B. c Gray58", +"V. c #959595959595", +"C. c Gray59", +"Z. c #979797979797", +"A. c #989898989898", +"S. c Gray60", +"D. c #9a9a9a9a9a9a", +"F. c #9b9b9b9b9b9b", +"G. c Gray61", +"H. c #9d9d9d9d9d9d", +"J. c Gray62", +"K. c #9f9f9f9f9f9f", +"L. c #a0a0a0a0a0a0", +"P. c Gray63", +"I. c #a2a2a2a2a2a2", +"U. c Gray64", +"Y. c #a4a4a4a4a4a4", +"T. c #a5a5a5a5a5a5", +"R. c Gray65", +"E. c #a7a7a7a7a7a7", +"W. c Gray66", +"Q. c #a9a9a9a9a9a9", +"!. c #aaaaaaaaaaaa", +"~. c Gray67", +"^. c #acacacacacac", +"/. c Gray68", +"(. c #aeaeaeaeaeae", +"). c #afafafafafaf", +"_. c Gray69", +"`. c #b1b1b1b1b1b1", +"'. c #b2b2b2b2b2b2", +"]. c Gray70", +"[. c #b4b4b4b4b4b4", +"{. c Gray71", +"}. c #b6b6b6b6b6b6", +"|. c #b7b7b7b7b7b7", +" X c Gray72", +".X c #b9b9b9b9b9b9", +"XX c Gray73", +"oX c #bbbbbbbbbbbb", +"OX c #bcbcbcbcbcbc", +"+X c Gray74", +"@X c #bebebebebebe", +"#X c Gray75", +"$X c #c0c0c0c0c0c0", +"%X c #c1c1c1c1c1c1", +"&X c Gray76", +"*X c #c3c3c3c3c3c3", +"=X c Gray77", +"-X c #c5c5c5c5c5c5", +";X c #c6c6c6c6c6c6", +":X c Gray78", +">X c #c8c8c8c8c8c8", +",X c Gray79", +"count == 0) { - wxEraseEvent eevent( win->GetId() ); + wxClientDC dc(win); + wxEraseEvent eevent( win->GetId(), &dc ); eevent.SetEventObject( win ); win->GetEventHandler()->ProcessEvent(eevent); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index b447e196fe..c9ff4f88d6 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -14,7 +14,7 @@ #include "wx/defs.h" #include "wx/window.h" -#include "wx/dc.h" +#include "wx/dcclient.h" #include "wx/frame.h" #include "wx/app.h" #include "wx/layout.h" @@ -694,7 +694,8 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev if (gdk_event->count == 0) { - wxEraseEvent eevent( win->GetId() ); + wxClientDC dc(win); + wxEraseEvent eevent( win->GetId(), &dc ); eevent.SetEventObject( win ); win->GetEventHandler()->ProcessEvent(eevent); diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 546aa74f20..6b849660de 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/timer.h" #include "wx/intl.h" #include "wx/dc.h" #include "wx/window.h"