diff --git a/Projects/CodeBlocks/SleepyHead.cbp b/Projects/CodeBlocks/SleepyHead.cbp index d4e11342..a0c7a8e7 100644 --- a/Projects/CodeBlocks/SleepyHead.cbp +++ b/Projects/CodeBlocks/SleepyHead.cbp @@ -45,16 +45,18 @@ - + + - + - + + @@ -162,7 +164,6 @@ - @@ -170,9 +171,9 @@ - + - + diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 97d76f4b..4294f0e0 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8300,7 +8300,11 @@ "tinyxml/tinyxml.h" -1308004574 /home/mark/projects/git/sleepyhead/src/graphs/graph.h +1308044762 /home/mark/projects/git/sleepyhead/src/graphs/graph.h + + + + @@ -8308,7 +8312,7 @@ 1308026543 D -1308032101 /home/mark/projects/git/sleepyhead/src/version.h +1308044876 /home/mark/projects/git/sleepyhead/src/version.h 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed @@ -8360,12 +8364,8 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1308030539 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp - - - +1308044596 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp - @@ -8835,7 +8835,7 @@ -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxprec.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxprec.h "wx/defs.h" "wx/chartype.h" "wx/msw/wrapwin.h" @@ -8848,7 +8848,7 @@ "wx/mgl/private.h" "wx/wx.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/defs.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/defs.h "wx/platform.h" "wx/version.h" "wx/dlimpexp.h" @@ -8861,7 +8861,7 @@ "wx/msw/winundef.h" "wx/features.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/platform.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/platform.h @@ -8877,15 +8877,15 @@ "wx/chkconf.h" "wx/palmos/missing.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/lib/wx/include/i686-pc-mingw32-msw-unicode-static-2.9/wx/setup.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/lib/wx/include/i686-pc-mingw32-msw-unicode-static-2.9/wx/setup.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/libraries.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/libraries.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/gccpriv.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/gccpriv.h <_mingw.h> -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/chkconf.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/chkconf.h "wx/palmos/chkconf.h" "wx/msw/wince/chkconf.h" "wx/msw/chkconf.h" @@ -8900,23 +8900,23 @@ "wx/unix/chkconf.h" "wx/univ/chkconf.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/chkconf.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/chkconf.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/version.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/version.h "wx/cpp.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cpp.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cpp.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dlimpexp.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dlimpexp.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/debug.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/debug.h "wx/chartype.h" "wx/cpp.h" "wx/dlimpexp.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/chartype.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/chartype.h "wx/platform.h" @@ -8931,29 +8931,29 @@ -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/windowid.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/windowid.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/winundef.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/winundef.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/features.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/features.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapwin.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapwin.h "wx/platform.h" "wx/msw/winundef.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapcctl.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapcctl.h "wx/msw/wrapwin.h" "wx/msw/missing.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/missing.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/missing.h "wx/msw/winundef.h" "wx/msw/wince/missing.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapcdlg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapcdlg.h "wx/defs.h" "wx/msw/wrapwin.h" "wx/msw/private.h" @@ -8961,7 +8961,7 @@ "wx/msw/winundef.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/private.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/private.h "wx/msw/wrapwin.h" "wx/msw/microwin.h" "wx/log.h" @@ -8969,7 +8969,7 @@ "wx/gdicmn.h" "wx/colour.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/log.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/log.h "wx/defs.h" "wx/string.h" "wx/strvararg.h" @@ -8982,7 +8982,7 @@ "wx/generic/logg.h" "wx/cocoa/log.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/string.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/string.h "wx/defs.h" @@ -9006,7 +9006,7 @@ "wx/iosfwrap.h" "wx/crt.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrtbase.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrtbase.h "wx/chartype.h" @@ -9016,7 +9016,7 @@ -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/strvararg.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/strvararg.h "wx/platform.h" "wx/cpp.h" "wx/chartype.h" @@ -9028,7 +9028,7 @@ "wx/stringimpl.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/strconv.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/strconv.h "wx/defs.h" "wx/chartype.h" "wx/buffer.h" @@ -9036,24 +9036,24 @@ "wx/fontenc.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/buffer.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/buffer.h "wx/chartype.h" "wx/wxcrtbase.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/typeinfo.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/typeinfo.h "wx/defs.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/fontenc.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/fontenc.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/unichar.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/unichar.h "wx/defs.h" "wx/chartype.h" "wx/stringimpl.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stringimpl.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stringimpl.h "wx/defs.h" "wx/chartype.h" "wx/wxcrtbase.h" @@ -9062,47 +9062,47 @@ "wx/afterstd.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/beforestd.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/beforestd.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/afterstd.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/afterstd.h "wx/msw/winundef.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stringops.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stringops.h "wx/chartype.h" "wx/stringimpl.h" "wx/unichar.h" "wx/buffer.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tls.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tls.h "wx/defs.h" "wx/msw/tls.h" "wx/os2/tls.h" "wx/unix/tls.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iosfwrap.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iosfwrap.h "wx/msw/winundef.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/crt.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/crt.h "wx/defs.h" "wx/chartype.h" "wx/wxcrt.h" "wx/wxcrtvararg.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrt.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrt.h "wx/wxcrtbase.h" "wx/string.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrtvararg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrtvararg.h "wx/wxcrt.h" "wx/strvararg.h" "wx/string.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/arrstr.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/arrstr.h "wx/defs.h" "wx/string.h" "wx/dynarray.h" @@ -9110,14 +9110,14 @@ "wx/afterstd.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dynarray.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dynarray.h "wx/defs.h" "wx/beforestd.h" "wx/afterstd.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hashmap.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hashmap.h "wx/string.h" "wx/wxcrt.h" @@ -9126,12 +9126,12 @@ -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/thread.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/thread.h "wx/defs.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/logg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/logg.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/window.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/window.h "wx/event.h" "wx/list.h" "wx/cursor.h" @@ -9157,7 +9157,7 @@ "wx/os2/window.h" "wx/univ/window.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/event.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/event.h "wx/defs.h" "wx/cpp.h" "wx/object.h" @@ -9172,30 +9172,30 @@ "wx/any.h" "wx/meta/convertible.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/object.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/object.h "wx/memory.h" "wx/xti.h" "wx/rtti.h" "wx/xti2.h" "wx/msw/msvcrt.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/memory.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/memory.h "wx/defs.h" "wx/string.h" "wx/msgout.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msgout.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msgout.h "wx/defs.h" "wx/chartype.h" "wx/strvararg.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xti.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xti.h "wx/defs.h" "wx/xtitypes.h" "wx/xtihandler.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtitypes.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtitypes.h "wx/defs.h" "wx/string.h" "wx/hashmap.h" @@ -9205,16 +9205,16 @@ "wx/log.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/flags.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/flags.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/intl.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/intl.h "wx/defs.h" "wx/string.h" "wx/translation.h" "wx/fontenc.h" "wx/language.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/translation.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/translation.h "wx/defs.h" "wx/string.h" "wx/buffer.h" @@ -9223,33 +9223,33 @@ "wx/strconv.h" "wx/scopedptr.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/language.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/language.h "wx/defs.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scopedptr.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scopedptr.h "wx/defs.h" "wx/checkeddelete.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/checkeddelete.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/checkeddelete.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtihandler.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtihandler.h "wx/defs.h" "wx/xti.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/rtti.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/rtti.h "wx/memory.h" "wx/flags.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xti2.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xti2.h "wx/xtiprop.h" "wx/xtictor.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtiprop.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtiprop.h "wx/defs.h" "wx/xti.h" "wx/any.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/any.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/any.h "wx/defs.h" "wx/string.h" @@ -9259,10 +9259,10 @@ "wx/datetime.h" "wx/variant.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/if.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/if.h "wx/defs.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/list.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/list.h "wx/defs.h" "wx/object.h" "wx/string.h" @@ -9272,7 +9272,7 @@ "wx/afterstd.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/datetime.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/datetime.h "wx/defs.h" "wx/msw/wince/time.h" @@ -9281,7 +9281,7 @@ "wx/anystr.h" "wx/dynarray.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/longlong.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/longlong.h "wx/defs.h" "wx/string.h" @@ -9289,10 +9289,10 @@ "wx/strvararg.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/anystr.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/anystr.h "wx/string.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/variant.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/variant.h "wx/defs.h" "wx/object.h" "wx/string.h" @@ -9304,20 +9304,20 @@ "wx/iosfwrap.h" "wx/any.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtictor.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtictor.h "wx/defs.h" "wx/xti.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/msvcrt.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/msvcrt.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/clntdata.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/clntdata.h "wx/defs.h" "wx/string.h" "wx/hashmap.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/gdicmn.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/gdicmn.h "wx/defs.h" "wx/list.h" "wx/string.h" @@ -9325,13 +9325,13 @@ "wx/hashmap.h" "wx/math.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/math.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/math.h "wx/defs.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cursor.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cursor.h "wx/defs.h" "wx/palmos/cursor.h" "wx/msw/cursor.h" @@ -9346,18 +9346,18 @@ "wx/os2/cursor.h" "wx/utils.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/cursor.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/cursor.h "wx/msw/gdiimage.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/gdiimage.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/gdiimage.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/list.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/gdiobj.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/gdiobj.h "wx/object.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/utils.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/utils.h "wx/object.h" "wx/list.h" "wx/filefn.h" @@ -9373,7 +9373,7 @@ -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filefn.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filefn.h "wx/list.h" "wx/arrstr.h" "wx/msw/wince/time.h" @@ -9407,29 +9407,29 @@ -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/versioninfo.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/versioninfo.h "wx/string.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/implicitconversion.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/implicitconversion.h "wx/defs.h" "wx/meta/if.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/mousestate.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/mousestate.h "wx/gdicmn.h" "wx/kbdstate.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/kbdstate.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/kbdstate.h "wx/defs.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/platinfo.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/platinfo.h "wx/string.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tracker.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tracker.h "wx/defs.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/convertible.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/convertible.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/font.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/font.h "wx/defs.h" "wx/fontenc.h" "wx/gdiobj.h" @@ -9446,10 +9446,10 @@ "wx/cocoa/font.h" "wx/os2/font.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/font.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/font.h "wx/gdicmn.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/colour.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/colour.h "wx/defs.h" "wx/gdiobj.h" "wx/variant.h" @@ -9465,10 +9465,10 @@ "wx/cocoa/colour.h" "wx/os2/colour.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/colour.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/colour.h "wx/object.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/region.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/region.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/palmos/region.h" @@ -9482,13 +9482,13 @@ "wx/cocoa/region.h" "wx/os2/region.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/region.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/region.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/validate.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/validate.h "wx/defs.h" "wx/event.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/palette.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/palette.h "wx/defs.h" "wx/object.h" "wx/gdiobj.h" @@ -9500,10 +9500,10 @@ "wx/osx/palette.h" "wx/os2/palette.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/palette.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/palette.h "wx/gdiobj.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/accel.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/accel.h "wx/defs.h" "wx/object.h" "wx/generic/accel.h" @@ -9515,25 +9515,25 @@ "wx/generic/accel.h" "wx/os2/accel.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/accel.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/accel.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/accel.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/accel.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/access.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/access.h "wx/defs.h" "wx/variant.h" "wx/msw/ole/access.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/access.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/access.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/window.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/window.h "wx/settings.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/settings.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/settings.h "wx/colour.h" "wx/font.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wx.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wx.h "wx/defs.h" "wx/object.h" "wx/dynarray.h" @@ -9614,12 +9614,12 @@ "wx/validate.h" "wx/valtext.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hash.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hash.h "wx/defs.h" "wx/string.h" "wx/object.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/app.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/app.h "wx/event.h" "wx/build.h" "wx/cmdargs.h" @@ -9640,22 +9640,22 @@ "wx/os2/app.h" "wx/univ/theme.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/build.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/build.h "wx/version.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cmdargs.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cmdargs.h "wx/arrstr.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/init.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/init.h "wx/defs.h" "wx/chartype.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/app.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/app.h "wx/event.h" "wx/icon.h" "wx/msw/wrapwin.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/icon.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/icon.h "wx/iconloc.h" "wx/generic/icon.h" "wx/msw/icon.h" @@ -9671,24 +9671,24 @@ "wx/os2/icon.h" "wx/variant.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iconloc.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iconloc.h "wx/string.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/icon.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/icon.h "wx/msw/gdiimage.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stream.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stream.h "wx/defs.h" "wx/object.h" "wx/string.h" "wx/filefn.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stopwatch.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stopwatch.h "wx/defs.h" "wx/longlong.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/timer.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/timer.h "wx/defs.h" "wx/object.h" "wx/longlong.h" @@ -9696,28 +9696,28 @@ "wx/stopwatch.h" "wx/utils.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/module.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/module.h "wx/object.h" "wx/list.h" "wx/arrstr.h" "wx/dynarray.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/containr.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/containr.h "wx/defs.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/panel.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/panel.h "wx/window.h" "wx/containr.h" "wx/univ/panel.h" "wx/msw/panel.h" "wx/generic/panelg.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/panel.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/panel.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/panelg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/panelg.h "wx/bitmap.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bitmap.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bitmap.h "wx/string.h" "wx/gdicmn.h" "wx/colour.h" @@ -9736,7 +9736,7 @@ "wx/os2/bitmap.h" "wx/generic/mask.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/image.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/image.h "wx/defs.h" "wx/object.h" "wx/string.h" @@ -9756,47 +9756,47 @@ "wx/imagxpm.h" "wx/imagiff.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagbmp.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagbmp.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagpng.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagpng.h "wx/defs.h" "wx/image.h" "wx/versioninfo.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imaggif.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imaggif.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagpcx.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagpcx.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagjpeg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagjpeg.h "wx/defs.h" "wx/image.h" "wx/versioninfo.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagtga.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagtga.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagtiff.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagtiff.h "wx/defs.h" "wx/image.h" "wx/versioninfo.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagpnm.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagpnm.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagxpm.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagxpm.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagiff.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imagiff.h "wx/image.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/bitmap.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/bitmap.h "wx/msw/gdiimage.h" "wx/palette.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/toplevel.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/toplevel.h "wx/nonownedwnd.h" "wx/iconbndl.h" "wx/containr.h" @@ -9814,27 +9814,27 @@ "wx/motif/toplevel.h" "wx/univ/toplevel.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/nonownedwnd.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/nonownedwnd.h "wx/dfb/nonownedwnd.h" "wx/osx/nonownedwnd.h" "wx/window.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iconbndl.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iconbndl.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/icon.h" "wx/dynarray.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/weakref.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/weakref.h "wx/tracker.h" "wx/meta/convertible.h" "wx/meta/int2type.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/int2type.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/int2type.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/toplevel.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/toplevel.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/frame.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/frame.h "wx/toplevel.h" "wx/statusbr.h" "wx/univ/frame.h" @@ -9847,7 +9847,7 @@ "wx/cocoa/frame.h" "wx/os2/frame.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statusbr.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statusbr.h "wx/defs.h" "wx/control.h" "wx/list.h" @@ -9859,7 +9859,7 @@ "wx/osx/statusbr.h" "wx/generic/statusbr.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/control.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/control.h "wx/defs.h" "wx/window.h" "wx/univ/control.h" @@ -9872,14 +9872,14 @@ "wx/cocoa/control.h" "wx/os2/control.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/control.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/control.h "wx/dynarray.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/statusbar.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/statusbar.h "wx/vector.h" "wx/tooltip.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/vector.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/vector.h "wx/defs.h" @@ -9891,21 +9891,21 @@ "wx/afterstd.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scopeguard.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scopeguard.h "wx/defs.h" "wx/except.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/except.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/except.h "wx/defs.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/movable.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/movable.h "wx/meta/pod.h" "wx/string.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/pod.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/meta/pod.h "wx/defs.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tooltip.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tooltip.h "wx/defs.h" "wx/msw/tooltip.h" "wx/gtk/tooltip.h" @@ -9914,13 +9914,13 @@ "wx/cocoa/tooltip.h" "wx/os2/tooltip.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/tooltip.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/tooltip.h "wx/object.h" "wx/gdicmn.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/frame.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/frame.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dc.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dc.h "wx/object.h" "wx/intl.h" "wx/cursor.h" @@ -9936,7 +9936,7 @@ "wx/region.h" "wx/affinematrix2d.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/brush.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/brush.h "wx/defs.h" "wx/object.h" "wx/gdiobj.h" @@ -9952,9 +9952,9 @@ "wx/cocoa/brush.h" "wx/os2/brush.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/brush.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/brush.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/pen.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/pen.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/palmos/pen.h" @@ -9968,39 +9968,39 @@ "wx/cocoa/pen.h" "wx/os2/pen.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/pen.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/pen.h "wx/gdiobj.h" "wx/gdicmn.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/affinematrix2d.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/affinematrix2d.h "wx/affinematrix2dbase.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/affinematrix2dbase.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/affinematrix2dbase.h "wx/defs.h" "wx/geometry.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/geometry.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/geometry.h "wx/defs.h" "wx/utils.h" "wx/gdicmn.h" "wx/math.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcclient.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcclient.h "wx/dc.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcmemory.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcmemory.h "wx/dc.h" "wx/bitmap.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcprint.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcprint.h "wx/defs.h" "wx/dc.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcscreen.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcscreen.h "wx/defs.h" "wx/dc.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/button.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/button.h "wx/defs.h" "wx/bitmap.h" "wx/control.h" @@ -10014,9 +10014,9 @@ "wx/os2/button.h" "wx/palmos/button.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/button.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/button.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/menuitem.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/menuitem.h "wx/defs.h" "wx/object.h" "wx/univ/menuitem.h" @@ -10029,20 +10029,20 @@ "wx/cocoa/menuitem.h" "wx/os2/menuitem.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/menuitem.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/menuitem.h "wx/ownerdrw.h" "wx/bitmap.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ownerdrw.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ownerdrw.h "wx/defs.h" "wx/font.h" "wx/colour.h" "wx/msw/ownerdrw.h" "wx/os2/ownerdrw.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ownerdrw.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ownerdrw.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/menu.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/menu.h "wx/defs.h" "wx/list.h" "wx/window.h" @@ -10057,12 +10057,12 @@ "wx/cocoa/menu.h" "wx/os2/menu.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/menu.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/menu.h "wx/accel.h" "wx/dynarray.h" "wx/arrstr.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dialog.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dialog.h "wx/defs.h" "wx/toplevel.h" "wx/univ/dialog.h" @@ -10075,10 +10075,10 @@ "wx/cocoa/dialog.h" "wx/os2/dialog.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/dialog.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/dialog.h "wx/panel.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msgdlg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msgdlg.h "wx/defs.h" "wx/dialog.h" "wx/stockitem.h" @@ -10091,17 +10091,17 @@ "wx/osx/msgdlg.h" "wx/os2/msgdlg.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stockitem.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stockitem.h "wx/defs.h" "wx/chartype.h" "wx/string.h" "wx/accel.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/msgdlgg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/msgdlgg.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/msgdlg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/msgdlg.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dataobj.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dataobj.h "wx/defs.h" "wx/string.h" "wx/bitmap.h" @@ -10132,22 +10132,22 @@ "wx/cocoa/dataobj2.h" "wx/os2/dataobj2.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/dataform.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/dataform.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/dataobj.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/dataobj.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/dataobj2.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ole/dataobj2.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ctrlsub.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ctrlsub.h "wx/defs.h" "wx/arrstr.h" "wx/control.h" "wx/msw/ctrlsub.h" "wx/motif/ctrlsub.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ctrlsub.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/ctrlsub.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bmpbuttn.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bmpbuttn.h "wx/defs.h" "wx/button.h" "wx/univ/bmpbuttn.h" @@ -10160,12 +10160,12 @@ "wx/os2/bmpbuttn.h" "wx/palmos/bmpbuttn.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/bmpbuttn.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/bmpbuttn.h "wx/button.h" "wx/bitmap.h" "wx/brush.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/checkbox.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/checkbox.h "wx/defs.h" "wx/control.h" "wx/univ/checkbox.h" @@ -10178,9 +10178,9 @@ "wx/os2/checkbox.h" "wx/palmos/checkbox.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/checkbox.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/checkbox.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/checklst.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/checklst.h "wx/defs.h" "wx/listbox.h" "wx/univ/checklst.h" @@ -10193,7 +10193,7 @@ "wx/cocoa/checklst.h" "wx/os2/checklst.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/listbox.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/listbox.h "wx/defs.h" "wx/ctrlsub.h" "wx/univ/listbox.h" @@ -10205,12 +10205,12 @@ "wx/os2/listbox.h" "wx/cocoa/listbox.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/listbox.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/listbox.h "wx/dynarray.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/checklst.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/checklst.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choice.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choice.h "wx/defs.h" "wx/ctrlsub.h" "wx/univ/choice.h" @@ -10224,9 +10224,9 @@ "wx/os2/choice.h" "wx/palmos/choice.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/choice.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/choice.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scrolbar.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scrolbar.h "wx/defs.h" "wx/control.h" "wx/univ/scrolbar.h" @@ -10238,9 +10238,9 @@ "wx/cocoa/scrolbar.h" "wx/os2/scrolbar.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/scrolbar.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/scrolbar.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stattext.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stattext.h "wx/defs.h" "wx/control.h" "wx/univ/stattext.h" @@ -10253,9 +10253,9 @@ "wx/os2/stattext.h" "wx/palmos/stattext.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/stattext.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/stattext.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statbmp.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statbmp.h "wx/defs.h" "wx/control.h" "wx/bitmap.h" @@ -10269,12 +10269,12 @@ "wx/cocoa/statbmp.h" "wx/os2/statbmp.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/statbmp.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/statbmp.h "wx/control.h" "wx/icon.h" "wx/bitmap.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statbox.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statbox.h "wx/defs.h" "wx/control.h" "wx/univ/statbox.h" @@ -10286,9 +10286,9 @@ "wx/cocoa/statbox.h" "wx/os2/statbox.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/statbox.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/statbox.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/radiobox.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/radiobox.h "wx/defs.h" "wx/ctrlsub.h" "wx/dynarray.h" @@ -10302,10 +10302,10 @@ "wx/os2/radiobox.h" "wx/palmos/radiobox.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/radiobox.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/radiobox.h "wx/statbox.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/radiobut.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/radiobut.h "wx/defs.h" "wx/control.h" "wx/univ/radiobut.h" @@ -10318,9 +10318,9 @@ "wx/os2/radiobut.h" "wx/palmos/radiobut.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/radiobut.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/radiobut.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textctrl.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textctrl.h "wx/defs.h" "wx/control.h" "wx/textentry.h" @@ -10339,7 +10339,7 @@ "wx/os2/textctrl.h" "wx/palmos/textctrl.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textentry.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textentry.h "wx/gdicmn.h" "wx/gtk/textentry.h" "wx/osx/textentry.h" @@ -10347,18 +10347,18 @@ "wx/motif/textentry.h" "wx/os2/textentry.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/textentry.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/textentry.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ioswrap.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ioswrap.h "wx/beforestd.h" "wx/afterstd.h" "wx/msw/winundef.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/textctrl.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/textctrl.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/slider.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/slider.h "wx/defs.h" "wx/control.h" "wx/univ/slider.h" @@ -10371,9 +10371,9 @@ "wx/os2/slider.h" "wx/palmos/slider.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/slider.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/slider.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/gauge.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/gauge.h "wx/defs.h" "wx/control.h" "wx/univ/gauge.h" @@ -10385,17 +10385,17 @@ "wx/cocoa/gauge.h" "wx/os2/gauge.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/gauge.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/gauge.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scrolwin.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/scrolwin.h "wx/panel.h" "wx/gtk/scrolwin.h" "wx/gtk1/scrolwin.h" "wx/generic/scrolwin.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/scrolwin.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/scrolwin.h -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dirdlg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dirdlg.h "wx/dialog.h" "wx/generic/dirdlgg.h" "wx/generic/dirdlgg.h" @@ -10407,9 +10407,9 @@ "wx/cocoa/dirdlg.h" "wx/generic/dirdlgg.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/dirdlg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/dirdlg.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/toolbar.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/toolbar.h "wx/defs.h" "wx/tbarbase.h" "wx/univ/toolbar.h" @@ -10423,27 +10423,27 @@ "wx/cocoa/toolbar.h" "wx/os2/toolbar.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tbarbase.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tbarbase.h "wx/defs.h" "wx/bitmap.h" "wx/list.h" "wx/control.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/toolbar.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/toolbar.h "wx/dynarray.h" "wx/imaglist.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imaglist.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/imaglist.h "wx/defs.h" "wx/generic/imaglist.h" "wx/msw/imaglist.h" "wx/osx/imaglist.h" "wx/palmos/imaglist.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/imaglist.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/imaglist.h "wx/bitmap.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/combobox.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/combobox.h "wx/defs.h" "wx/ctrlsub.h" "wx/textentry.h" @@ -10456,38 +10456,38 @@ "wx/cocoa/combobox.h" "wx/os2/combobox.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/combobox.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/combobox.h "wx/choice.h" "wx/textentry.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/layout.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/layout.h "wx/object.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/sizer.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/sizer.h "wx/defs.h" "wx/window.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choicdlg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choicdlg.h "wx/generic/choicdgg.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/choicdgg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/choicdgg.h "wx/dynarray.h" "wx/dialog.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textdlg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textdlg.h "wx/generic/textdlgg.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/textdlgg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/textdlgg.h "wx/defs.h" "wx/dialog.h" "wx/valtext.h" "wx/textctrl.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/valtext.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/valtext.h "wx/defs.h" "wx/validate.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filedlg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filedlg.h "wx/defs.h" "wx/dialog.h" "wx/arrstr.h" @@ -10501,9 +10501,9 @@ "wx/os2/filedlg.h" "wx/generic/filedlgg.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/filedlg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/filedlg.h -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/mdi.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/mdi.h "wx/defs.h" "wx/frame.h" "wx/menu.h" @@ -10514,17 +10514,17 @@ "wx/osx/mdi.h" "wx/cocoa/mdi.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/mdi.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/mdi.h "wx/frame.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/auibook.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/auibook.h "wx/defs.h" "wx/aui/framemanager.h" "wx/aui/dockart.h" "wx/aui/floatpane.h" "wx/control.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/framemanager.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/framemanager.h "wx/defs.h" "wx/dynarray.h" "wx/gdicmn.h" @@ -10533,20 +10533,20 @@ "wx/sizer.h" "wx/bitmap.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/dockart.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/dockart.h "wx/defs.h" "wx/pen.h" "wx/brush.h" "wx/bitmap.h" "wx/colour.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/floatpane.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/floatpane.h "wx/defs.h" "wx/weakref.h" "wx/minifram.h" "wx/frame.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/minifram.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/minifram.h "wx/defs.h" "wx/palmos/minifram.h" "wx/msw/minifram.h" @@ -10558,10 +10558,10 @@ "wx/os2/minifram.h" "wx/frame.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/minifram.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/minifram.h "wx/frame.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/aui.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/aui.h "wx/aui/framemanager.h" "wx/aui/dockart.h" "wx/aui/floatpane.h" @@ -10569,20 +10569,20 @@ "wx/aui/auibook.h" "wx/aui/tabmdi.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/auibar.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/auibar.h "wx/defs.h" "wx/control.h" "wx/sizer.h" "wx/pen.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/tabmdi.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aui/tabmdi.h "wx/frame.h" "wx/panel.h" "wx/notebook.h" "wx/icon.h" "wx/aui/auibook.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/notebook.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/notebook.h "wx/defs.h" "wx/bookctrl.h" "wx/univ/notebook.h" @@ -10594,26 +10594,26 @@ "wx/cocoa/notebook.h" "wx/os2/notebook.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bookctrl.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bookctrl.h "wx/defs.h" "wx/control.h" "wx/dynarray.h" "wx/notebook.h" "wx/choicebk.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choicebk.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choicebk.h "wx/defs.h" "wx/bookctrl.h" "wx/choice.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/notebook.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/notebook.h "wx/control.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/notebook.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/notebook.h "wx/event.h" "wx/control.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/calctrl.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/calctrl.h "wx/defs.h" "wx/dateevt.h" "wx/colour.h" @@ -10623,18 +10623,18 @@ "wx/msw/calctrl.h" "wx/generic/calctrlg.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dateevt.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dateevt.h "wx/event.h" "wx/datetime.h" "wx/window.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/calctrl.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/calctrl.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/calctrlg.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/calctrlg.h "wx/control.h" "wx/dcclient.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlwin.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlwin.h "wx/defs.h" "wx/window.h" "wx/scrolwin.h" @@ -10647,63 +10647,63 @@ "wx/filename.h" "wx/bitmap.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/config.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/config.h "wx/confbase.h" "wx/msw/regconf.h" "wx/os2/iniconf.h" "wx/palmos/prefconf.h" "wx/fileconf.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/confbase.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/confbase.h "wx/defs.h" "wx/string.h" "wx/object.h" "wx/base64.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/base64.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/base64.h "wx/string.h" "wx/buffer.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/regconf.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/regconf.h "wx/defs.h" "wx/msw/registry.h" "wx/object.h" "wx/confbase.h" "wx/buffer.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/registry.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/registry.h "wx/defs.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/fileconf.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/fileconf.h "wx/defs.h" "wx/textfile.h" "wx/string.h" "wx/confbase.h" "wx/filename.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textfile.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textfile.h "wx/defs.h" "wx/textbuf.h" "wx/file.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textbuf.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textbuf.h "wx/defs.h" "wx/arrstr.h" "wx/convauto.h" "wx/string.h" "wx/dynarray.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/convauto.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/convauto.h "wx/strconv.h" "wx/fontenc.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/file.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/file.h "wx/defs.h" "wx/string.h" "wx/filefn.h" "wx/strconv.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filename.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filename.h "wx/arrstr.h" "wx/filefn.h" "wx/datetime.h" @@ -10711,7 +10711,7 @@ "wx/longlong.h" "wx/file.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/winpars.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/winpars.h "wx/defs.h" "wx/module.h" "wx/font.h" @@ -10719,7 +10719,7 @@ "wx/html/htmlcell.h" "wx/encconv.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlpars.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlpars.h "wx/defs.h" "wx/html/htmltag.h" "wx/filesys.h" @@ -10728,45 +10728,45 @@ "wx/vector.h" "wx/fontenc.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmltag.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmltag.h "wx/defs.h" "wx/object.h" "wx/arrstr.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filesys.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filesys.h "wx/defs.h" "wx/stream.h" "wx/datetime.h" "wx/filename.h" "wx/hashmap.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hashset.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hashset.h "wx/hashmap.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlcell.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlcell.h "wx/defs.h" "wx/html/htmltag.h" "wx/html/htmldefs.h" "wx/window.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmldefs.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmldefs.h "wx/defs.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/encconv.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/encconv.h "wx/defs.h" "wx/object.h" "wx/fontenc.h" "wx/dynarray.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlfilt.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlfilt.h "wx/defs.h" "wx/filesys.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/datectrl.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/datectrl.h "wx/defs.h" "wx/control.h" "wx/datetime.h" @@ -10774,32 +10774,32 @@ "wx/msw/datectrl.h" "wx/generic/datectrl.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/datectrl.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/datectrl.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/datectrl.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/datectrl.h "wx/compositewin.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/compositewin.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/compositewin.h "wx/window.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/progdlg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/progdlg.h "wx/defs.h" "wx/palmos/progdlg.h" "wx/generic/progdlgg.h" "wx/msw/progdlg.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/progdlgg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/progdlgg.h "wx/dialog.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/progdlg.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/progdlg.h -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/fs_mem.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/fs_mem.h "wx/defs.h" "wx/filesys.h" "wx/hashmap.h" "wx/bitmap.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/treectrl.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/treectrl.h "wx/defs.h" "wx/control.h" "wx/treebase.h" @@ -10813,47 +10813,47 @@ "wx/generic/treectlg.h" "wx/generic/treectlg.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/treebase.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/treebase.h "wx/defs.h" "wx/window.h" "wx/event.h" "wx/dynarray.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/treectlg.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/generic/treectlg.h "wx/scrolwin.h" "wx/pen.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/treectrl.h +1308044095 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/treectrl.h "wx/textctrl.h" "wx/dynarray.h" "wx/treebase.h" "wx/hashmap.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dir.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dir.h "wx/longlong.h" "wx/string.h" "wx/filefn.h" -1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ffile.h +1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/ffile.h "wx/defs.h" "wx/string.h" "wx/filefn.h" "wx/convauto.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcgraph.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcgraph.h "wx/dc.h" "wx/geometry.h" "wx/graphics.h" -1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/graphics.h +1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/graphics.h "wx/defs.h" "wx/geometry.h" "wx/dynarray.h" "wx/dc.h" "wx/vector.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/glcanvas.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/glcanvas.h "wx/defs.h" "wx/app.h" "wx/palette.h" @@ -10865,12 +10865,12 @@ "wx/osx/glcanvas.h" "wx/cocoa/glcanvas.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/glcanvas.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/glcanvas.h "wx/palette.h" "wx/msw/wrapwin.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stdpaths.h +1308041947 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stdpaths.h "wx/defs.h" "wx/string.h" "wx/filefn.h" @@ -10880,14 +10880,14 @@ "wx/unix/stdpaths.h" "wx/palmos/stdpaths.h" -1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/stdpaths.h +1308041948 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/stdpaths.h -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aboutdlg.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aboutdlg.h "wx/defs.h" "wx/app.h" "wx/icon.h" -1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcbuffer.h +1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcbuffer.h "wx/dcmemory.h" "wx/dcclient.h" "wx/window.h" @@ -10940,18 +10940,18 @@ "texture-atlas.h" "texture-glyph.h" -1308000392 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.h +1308044790 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.h -1307974462 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.h - +1308044489 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.h "text-markup.h" "vertex-buffer.h" -1308009703 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h +1308040815 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h + "freetype-gl/vector.h" @@ -11049,7 +11049,7 @@ "texture-glyph.h" -1308030709 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp +1308032101 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index f64d204f..a2cb64f7 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -1,6 +1,6 @@ - + @@ -8,10 +8,10 @@ - + - + @@ -20,13 +20,13 @@ - + - + @@ -38,28 +38,28 @@ - + - + - - + + - + - - + + @@ -94,7 +94,4 @@ - - - diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 193613c8..87ccc9af 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -5,19 +5,10 @@ Author: Mark Watkins License: LGPL */ -#define GL_GLEXT_PROTOTYPES - -#ifdef __DARWIN__ -#include -#include -#elif defined(__WXMSW__) -#define GLEW_STATIC -#include -#endif #include -#include +//#include #include #include @@ -335,7 +326,7 @@ END_EVENT_TABLE() static int wx_gl_attribs[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 24, 0}; gGraphWindow::gGraphWindow() -: wxGLCanvas( (wxWindow *)NULL,(wxGLContext *)NULL,wxID_ANY) //,wxDefaultPosition,wxDefaultSize,wxT("GLContext"),(int *)wx_gl_attribs,wxNullPalette) +: wxGLCanvas( (wxWindow *)NULL,shared_context,wxID_ANY) //,wxDefaultPosition,wxDefaultSize,wxT("GLContext"),(int *)wx_gl_attribs,wxNullPalette) { } @@ -822,13 +813,12 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) //pBuffers are evil.. but I need to use them here. #if defined(__WXMSW__) - + /*#define MAX_ATTRIBS 8 HDC hDC = wglGetCurrentDC(); // Get ready to query for a suitable pixel format that meets our minimum requirements. - - /*int iAttributes[2*MAX_ATTRIBS]; + int iAttributes[2*MAX_ATTRIBS]; float fAttributes[2*MAX_ATTRIBS]; int nfAttribs = 0; int niAttribs = 0; @@ -877,7 +867,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) for (i=0; i<2*MAX_ATTRIBS; i++ )iAttributes[i] = 0; - g_hPBuffer=wglCreatePbufferARB( hDC, pformat, PBUFFERSIZE, PBUFFERSIZE, iAttributes ); + HPBUFFERARB g_hPBuffer=wglCreatePbufferARB( hDC, pformat, PBUFFERSIZE, PBUFFERSIZE, iAttributes ); g_hPBufDC=wglGetPbufferDCARB( g_hPBuffer ); int w,h; @@ -887,11 +877,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) g_hPBufRC=wglCreateContext(g_hPBufDC); - - return true; */ - - - +*/ // WGL pBuffer Implementation return &wxNullBitmap; #elif defined(__WXMAC__) || defined(__WXDARWIN__) @@ -912,15 +898,27 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) #if wxCHECK_VERSION(2,9,0) display=wxGetX11Display(); fbc = GetGLXFBConfig(); + fbc = &fbc[0]; #else display=(Display *)wxGetDisplay(); + int doubleBufferAttributess[] = { + GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT, + GLX_RENDER_TYPE, GLX_RGBA_BIT, + GLX_DOUBLEBUFFER, True, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + None + }; + fbc=glXChooseFBConfig(display, DefaultScreen(display), doubleBufferAttributess, &ret); + // TODO: // have to setup a GLXFBConfig structure for wx2.8 because wx2.8 is crap. // already done this crap but deleted it.. arggghh..... - return &wxNullBitmap; + // return &wxNullBitmap; #endif - GLXPbuffer pBuffer=glXCreatePbuffer(display, fbc[0], attrib ); + GLXPbuffer pBuffer=glXCreatePbuffer(display, *fbc, attrib ); if (pBuffer == 0) { wxLogError(wxT("pBuffer not availble")); } @@ -933,19 +931,18 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) if (!cx && real_shared_context) cx=real_shared_context; // Only available after redraw.. :( else { // First render screws up unless we do this.. - gx=cx = glXCreateNewContext(display,fbc[0],GLX_RGBA_TYPE, NULL, True); + gx=cx = glXCreateNewContext(display,*fbc,GLX_RGBA_TYPE, NULL, True); } //real_shared_context = - - - //GLXContext cx=real_shared_context; if (cx == 0) { wxLogError(wxT("CX not availble")); } - //XFree(fbc); +#if wxCHECK_VERSION(2,9,0) + XFree(fbc); +#endif if (glXMakeCurrent(display,pBuffer,cx)!=True) { wxLogError(wxT("Couldn't make buffer current")); } @@ -2029,7 +2026,26 @@ gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _lab gLineOverlayBar::~gLineOverlayBar() { } - +//nov = number of vertex +//r = radius +void Dot(int nov, float r) +{ + if (nov < 4) nov = 4; + if (nov > 360) nov = 360; + float angle = (360/nov)*(3.142159/180); + float x[360] = {0}; + float y[360] = {0}; + for (int i = 0; i < nov; i++){ + x[i] = cosf(r*cosf(i*angle)); + y[i] = sinf(r*sinf(i*angle)); + glBegin(GL_POLYGON); + for (int i = 0; i < nov; i++){ + glVertex2f(x[i],y[i]); + } + glEnd(); + } + //render to texture and map to GL_POINT_SPRITE +} void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; @@ -2086,8 +2102,13 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) } glEnd(); + //glEnable(GL_POINT_SPRITE); // Draw the dots above - glPointSize(6); + //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + Dot(100,50); + glPointSize(5); + glEnable(GL_POINT_SMOOTH); + glHint(GL_POINT_SMOOTH_HINT, GL_NICEST); glBegin(GL_POINTS); for (int i=fi;ipoint[n][i]; @@ -2097,6 +2118,8 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) } } glEnd(); + glDisable(GL_POINT_SMOOTH); + //glDisable(GL_POINT_SPRITE); // Text Labels & Spans for (int i=fi;i +#include +#elif defined(__WXMSW__) + +#define GLEW_STATIC +#define WGL_WGLEXT_PROTOTYPES +//#include +#include +#include +//#include +//#include +// windows gl extensions + +#endif + +#undef Yield #include #include diff --git a/src/libs/freetype-gl/texture-glyph.cpp b/src/libs/freetype-gl/texture-glyph.cpp index ef77d493..927aaed2 100644 --- a/src/libs/freetype-gl/texture-glyph.cpp +++ b/src/libs/freetype-gl/texture-glyph.cpp @@ -23,12 +23,16 @@ #if defined(__APPLE__) #include #elif defined(__WXMSW__) + #define GL_GLEXT_PROTOTYPES #define GLEW_STATIC +#define _UNICODE 1 #include -#else - #include -#endif +//#include +//#else +// #include +#endif + //#include //#include #include "texture-glyph.h" diff --git a/src/libs/freetype-gl/texture-glyph.h b/src/libs/freetype-gl/texture-glyph.h index 99967f46..b27e5714 100644 --- a/src/libs/freetype-gl/texture-glyph.h +++ b/src/libs/freetype-gl/texture-glyph.h @@ -23,7 +23,7 @@ #ifndef __TEXTURE_GLYPH_H__ #define __TEXTURE_GLYPH_H__ -#include +//#include #include "text-markup.h" #include "vertex-buffer.h" diff --git a/src/libs/freetype-gl/vertex-buffer.h b/src/libs/freetype-gl/vertex-buffer.h index 704f5191..9da5bce4 100644 --- a/src/libs/freetype-gl/vertex-buffer.h +++ b/src/libs/freetype-gl/vertex-buffer.h @@ -31,7 +31,9 @@ #include #elif defined(__WXMSW__) #define GLEW_STATIC +//#include #include +#include #else //#include diff --git a/src/version.h b/src/version.h index e436fbd2..0aa7675f 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long _MAJOR = 0; static const long _MINOR = 7; - static const long _BUILD = 5659; - static const long _REVISION = 14237; + static const long _BUILD = 5717; + static const long _REVISION = 14559; //Miscellaneous Version Types - static const long _BUILDS_COUNT = 5892; - #define _RC_FILEVERSION 0,7,5659,14237 - #define _RC_FILEVERSION_STRING "0, 7, 5659, 14237\0" - static const char _FULLVERSION_STRING[] = "0.7.5659.14237"; + static const long _BUILDS_COUNT = 6004; + #define _RC_FILEVERSION 0,7,5717,14559 + #define _RC_FILEVERSION_STRING "0, 7, 5717, 14559\0" + static const char _FULLVERSION_STRING[] = "0.7.5717.14559"; //These values are to keep track of your versioning state, don't modify them. static const long _BUILD_HISTORY = 0;