From 8765d43869bb50b8999e1d8c105c58c2e2064196 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sat, 11 Jun 2011 20:20:44 +1000
Subject: [PATCH] Initial OpenGL conversion.. Note: Text isn't converted yet
---
Projects/CodeBlocks/SleepyHead.cbp | 6 +-
Projects/CodeBlocks/SleepyHead.depend | 2122 ++++++++++++++++++++++++-
Projects/CodeBlocks/SleepyHead.layout | 18 +-
src/SleepyHeadMain.cpp | 1 +
src/graphs/graph.cpp | 462 ++++--
src/graphs/graph.h | 73 +-
src/version.h | 12 +-
7 files changed, 2541 insertions(+), 153 deletions(-)
diff --git a/Projects/CodeBlocks/SleepyHead.cbp b/Projects/CodeBlocks/SleepyHead.cbp
index 7a68c587..6a7393e4 100644
--- a/Projects/CodeBlocks/SleepyHead.cbp
+++ b/Projects/CodeBlocks/SleepyHead.cbp
@@ -51,7 +51,7 @@
</Compiler>
<Linker>
<Add option="-s" />
- <Add option="`i686-pc-mingw32-wx-config --version=2.9 --libs richtext,aui,xrc,qa,html,adv,core,xml,net,base`" />
+ <Add option="`i686-pc-mingw32-wx-config --version=2.9 --libs richtext,aui,xrc,qa,html,adv,core,xml,net,base,gl`" />
<Add option="-lgdiplus" />
</Linker>
</Target>
@@ -69,7 +69,7 @@
<Add directory="../../src" />
</Compiler>
<Linker>
- <Add option="`wx-config --version=2.9 --libs aui,xrc,qa,html,adv,core,net,base`" />
+ <Add option="`wx-config --version=2.9 --libs aui,xrc,qa,html,adv,core,net,base,gl`" />
</Linker>
</Target>
</Build>
@@ -80,7 +80,7 @@
<Add directory="../../src" />
</Compiler>
<Linker>
- <Add option="`wx-config --version=2.8 --libs aui,xrc,qa,html,adv,core,net,base`" />
+ <Add option="`wx-config --version=2.8 --libs aui,xrc,qa,html,adv,core,net,base,gl`" />
</Linker>
<Unit filename="../../src/GUIFrame.cpp" />
<Unit filename="../../src/GUIFrame.h" />
diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend
index 2369194a..f1471afa 100644
--- a/Projects/CodeBlocks/SleepyHead.depend
+++ b/Projects/CodeBlocks/SleepyHead.depend
@@ -8258,7 +8258,7 @@
1307418393 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h
<wx/app.h>
-1307708712 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
+1307772405 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
<wx/listbox.h>
<wx/treectrl.h>
"SleepyHeadApp.h"
@@ -8300,12 +8300,13 @@
<map>
"tinyxml/tinyxml.h"
-1307719537 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
+1307782451 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
<wx/dcgraph.h>
+ <wx/glcanvas.h>
<sleeplib/machine.h>
<list>
-1307766136 /home/mark/projects/git/sleepyhead/src/version.h
+1307787377 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@@ -8323,7 +8324,7 @@
"preferences.h"
"tinyxml/tinyxml.h"
-1307711811 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
+1307772433 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@@ -8343,10 +8344,11 @@
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
-1307766136 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
+1307787375 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/graphics.h>
+ <wx/glcanvas.h>
<wx/log.h>
<math.h>
"graph.h"
@@ -8755,3 +8757,2113 @@
1307528666 /usr/include/wx-2.9/wx/compositewin.h
"wx/window.h"
+1307528668 /usr/include/wx-2.9/wx/glcanvas.h
+ "wx/defs.h"
+ "wx/app.h"
+ "wx/palette.h"
+ "wx/window.h"
+ "wx/msw/glcanvas.h"
+ "wx/x11/glcanvas.h"
+ "wx/gtk/glcanvas.h"
+ "wx/gtk1/glcanvas.h"
+ "wx/osx/glcanvas.h"
+ "wx/cocoa/glcanvas.h"
+
+1307528668 /usr/include/wx-2.9/wx/gtk/glcanvas.h
+ "wx/unix/glx11.h"
+
+1307528668 /usr/include/wx-2.9/wx/unix/glx11.h
+ <GL/glx.h>
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/glcanvas.h
+ "wx/defs.h"
+ "wx/app.h"
+ "wx/palette.h"
+ "wx/window.h"
+ "wx/msw/glcanvas.h"
+ "wx/x11/glcanvas.h"
+ "wx/gtk/glcanvas.h"
+ "wx/gtk1/glcanvas.h"
+ "wx/osx/glcanvas.h"
+ "wx/cocoa/glcanvas.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/msw/glcanvas.h
+ "wx/palette.h"
+ "wx/msw/wrapwin.h"
+ <GL/gl.h>
+
+1302101440 /usr/include/wx-2.8/wx/glcanvas.h
+ "wx/defs.h"
+ "wx/msw/glcanvas.h"
+ "wx/x11/glcanvas.h"
+ "wx/gtk/glcanvas.h"
+ "wx/gtk1/glcanvas.h"
+ "wx/x11/glcanvas.h"
+ "wx/mac/glcanvas.h"
+ "wx/cocoa/glcanvas.h"
+ "wx/app.h"
+
+1302101441 /usr/include/wx-2.8/wx/gtk/glcanvas.h
+ "wx/scrolwin.h"
+ "wx/app.h"
+ <GL/gl.h>
+ <GL/glx.h>
+ <GL/glu.h>
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxprec.h
+ "wx/defs.h"
+ "wx/chartype.h"
+ "wx/msw/wrapwin.h"
+ "wx/msw/wrapcctl.h"
+ "wx/msw/wrapcdlg.h"
+ "wx/msw/private.h"
+ "wx/msw/missing.h"
+ <PalmOS.h>
+ "wx/os2/private.h"
+ "wx/mgl/private.h"
+ "wx/wx.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/defs.h
+ "wx/platform.h"
+ "wx/version.h"
+ "wx/dlimpexp.h"
+ <stddef.h>
+ "wx/debug.h"
+ <sys/types.h>
+ <sys/types.h>
+ "wx/windowid.h"
+ <unistd.h>
+ "wx/msw/winundef.h"
+ "wx/features.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/platform.h
+ <stddef.h>
+ <unistd.h>
+ <TargetConditionals.h>
+ <AvailabilityMacros.h>
+ "wx/osx/config_xcode.h"
+ "wx/setup.h"
+ "wx/setup_gccxml.h"
+ "wx/msw/wince/libraries.h"
+ "wx/msw/libraries.h"
+ "wx/msw/gccpriv.h"
+ <TargetConditionals.h>
+ <AvailabilityMacros.h>
+ "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
+
+1307765964 /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
+ <_mingw.h>
+ <w32api.h>
+
+1307765963 /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"
+ "wx/gtk/chkconf.h"
+ "wx/cocoa/chkconf.h"
+ "wx/osx/chkconf.h"
+ "wx/os2/chkconf.h"
+ "wx/mgl/chkconf.h"
+ "wx/dfb/chkconf.h"
+ "wx/motif/chkconf.h"
+ "wx/x11/chkconf.h"
+ "wx/unix/chkconf.h"
+ "wx/univ/chkconf.h"
+
+1307765964 /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
+ "wx/cpp.h"
+
+1307765963 /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
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/debug.h
+ <assert.h>
+ <limits.h>
+ "wx/chartype.h"
+ "wx/cpp.h"
+ "wx/dlimpexp.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/chartype.h
+ "wx/platform.h"
+ <sys/types.h>
+ <wchar.h>
+ <wcstr.h>
+ <stdlib.h>
+ <widec.h>
+ <ctype.h>
+ <stddef.h>
+ <stddef.h>
+ <string.h>
+ <ctype.h>
+ <tchar.h>
+ <ctype.h>
+
+1307765965 /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
+
+1307765963 /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
+ "wx/platform.h"
+ <winsock2.h>
+ <windows.h>
+ "wx/msw/winundef.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/wrapcctl.h
+ "wx/msw/wrapwin.h"
+ <commctrl.h>
+ "wx/msw/missing.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/missing.h
+ <windows.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
+ "wx/defs.h"
+ "wx/msw/wrapwin.h"
+ "wx/msw/private.h"
+ "wx/msw/missing.h"
+ <commdlg.h>
+ "wx/msw/winundef.h"
+
+1307765964 /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"
+ "wx/window.h"
+ "wx/gdicmn.h"
+ "wx/colour.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/log.h
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/strvararg.h"
+ "wx/arrstr.h"
+ <time.h>
+ "wx/dynarray.h"
+ "wx/hashmap.h"
+ "wx/thread.h"
+ "wx/iosfwrap.h"
+ "wx/generic/logg.h"
+ "wx/cocoa/log.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/string.h
+ "wx/defs.h"
+ <ctype.h>
+ <stdio.h>
+ <string.h>
+ <stdarg.h>
+ <limits.h>
+ <string.h>
+ <stdio.h>
+ <stdarg.h>
+ <limits.h>
+ <stdlib.h>
+ <strings.h>
+ "wx/wxcrtbase.h"
+ "wx/strvararg.h"
+ "wx/buffer.h"
+ "wx/strconv.h"
+ "wx/stringimpl.h"
+ "wx/stringops.h"
+ "wx/unichar.h"
+ "wx/tls.h"
+ "wx/iosfwrap.h"
+ "wx/crt.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrtbase.h
+ "wx/chartype.h"
+ <stdio.h>
+ <string.h>
+ <ctype.h>
+ <wchar.h>
+ <wctype.h>
+ <time.h>
+ <io.h>
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/strvararg.h
+ "wx/platform.h"
+ "wx/cpp.h"
+ "wx/chartype.h"
+ "wx/strconv.h"
+ "wx/buffer.h"
+ "wx/unichar.h"
+ <type_traits>
+ <type_traits>
+ <tr1/type_traits>
+ "wx/stringimpl.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/strconv.h
+ "wx/defs.h"
+ "wx/chartype.h"
+ "wx/buffer.h"
+ "typeinfo.h"
+ <stdlib.h>
+ "wx/fontenc.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/buffer.h
+ "wx/chartype.h"
+ "wx/wxcrtbase.h"
+ <stdlib.h>
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/typeinfo.h
+ "wx/defs.h"
+ <typeinfo>
+ <string.h>
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/chartype.h"
+ "wx/stringimpl.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stringimpl.h
+ "wx/defs.h"
+ "wx/chartype.h"
+ "wx/wxcrtbase.h"
+ <stdlib.h>
+ "wx/beforestd.h"
+ <string>
+ "wx/afterstd.h"
+
+1307765963 /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
+ "wx/msw/winundef.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/msw/tls.h"
+ "wx/os2/tls.h"
+ "wx/unix/tls.h"
+ <stdlib.h>
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/iosfwrap.h
+ <iostream.h>
+ <iosfwd>
+ "wx/msw/winundef.h"
+
+1307765963 /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
+ "wx/wxcrtbase.h"
+ "wx/string.h"
+ <string.h>
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wxcrtvararg.h
+ "wx/wxcrt.h"
+ "wx/strvararg.h"
+ "wx/string.h"
+ <stdarg.h>
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/arrstr.h
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/dynarray.h"
+ "wx/beforestd.h"
+ <iterator>
+ "wx/afterstd.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dynarray.h
+ "wx/defs.h"
+ "wx/beforestd.h"
+ <vector>
+ <algorithm>
+ "wx/afterstd.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/hashmap.h
+ "wx/string.h"
+ "wx/wxcrt.h"
+ <unordered_map>
+ <tr1/unordered_map>
+ <ext/hash_map>
+ <hash_map>
+ <stddef.h>
+
+1307765964 /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
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/window.h
+ "wx/event.h"
+ "wx/list.h"
+ "wx/cursor.h"
+ "wx/font.h"
+ "wx/colour.h"
+ "wx/region.h"
+ "wx/utils.h"
+ "wx/intl.h"
+ "wx/validate.h"
+ "wx/palette.h"
+ "wx/accel.h"
+ "wx/access.h"
+ "wx/palmos/window.h"
+ "wx/msw/window.h"
+ "wx/motif/window.h"
+ "wx/gtk/window.h"
+ "wx/gtk1/window.h"
+ "wx/x11/window.h"
+ "wx/mgl/window.h"
+ "wx/dfb/window.h"
+ "wx/osx/window.h"
+ "wx/cocoa/window.h"
+ "wx/os2/window.h"
+ "wx/univ/window.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/event.h
+ "wx/defs.h"
+ "wx/cpp.h"
+ "wx/object.h"
+ "wx/clntdata.h"
+ "wx/gdicmn.h"
+ "wx/cursor.h"
+ "wx/mousestate.h"
+ "wx/dynarray.h"
+ "wx/thread.h"
+ "wx/tracker.h"
+ "wx/typeinfo.h"
+ "wx/any.h"
+ "wx/meta/convertible.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/msgout.h"
+ <stddef.h>
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/xtitypes.h"
+ "wx/xtihandler.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/xtitypes.h
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/hashmap.h"
+ "wx/arrstr.h"
+ "wx/flags.h"
+ "wx/intl.h"
+ "wx/log.h"
+ <typeinfo>
+
+1307765963 /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
+ "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
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/buffer.h"
+ "wx/language.h"
+ "wx/hashmap.h"
+ "wx/strconv.h"
+ "wx/scopedptr.h"
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/checkeddelete.h"
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/xti.h"
+
+1307765964 /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
+ "wx/xtiprop.h"
+ "wx/xtictor.h"
+
+1307765964 /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
+ "wx/defs.h"
+ <new>
+ "wx/string.h"
+ "wx/meta/if.h"
+ "wx/typeinfo.h"
+ "wx/list.h"
+ "wx/datetime.h"
+ "wx/variant.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/string.h"
+ "wx/beforestd.h"
+ <algorithm>
+ <iterator>
+ <list>
+ "wx/afterstd.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/datetime.h
+ "wx/defs.h"
+ "wx/msw/wince/time.h"
+ <time.h>
+ <limits.h>
+ "wx/longlong.h"
+ "wx/anystr.h"
+ "wx/dynarray.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/longlong.h
+ "wx/defs.h"
+ "wx/string.h"
+ <limits.h>
+ "wx/iosfwrap.h"
+ <limits>
+ "wx/strvararg.h"
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/string.h"
+ "wx/arrstr.h"
+ "wx/list.h"
+ "wx/cpp.h"
+ "wx/longlong.h"
+ "wx/datetime.h"
+ "wx/iosfwrap.h"
+ "wx/any.h"
+
+1307765964 /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
+ <stdlib.h>
+ <crtdbg.h>
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/list.h"
+ "wx/string.h"
+ "wx/fontenc.h"
+ "wx/hashmap.h"
+ "wx/math.h"
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/math.h
+ "wx/defs.h"
+ <math.h>
+ <float.h>
+ <ieeefp.h>
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/cursor.h
+ "wx/defs.h"
+ "wx/palmos/cursor.h"
+ "wx/msw/cursor.h"
+ "wx/motif/cursor.h"
+ "wx/gtk/cursor.h"
+ "wx/gtk1/cursor.h"
+ "wx/x11/cursor.h"
+ "wx/mgl/cursor.h"
+ "wx/dfb/cursor.h"
+ "wx/osx/cursor.h"
+ "wx/cocoa/cursor.h"
+ "wx/os2/cursor.h"
+ "wx/utils.h"
+
+1307765965 /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
+ "wx/gdiobj.h"
+ "wx/gdicmn.h"
+ "wx/list.h"
+
+1307765965 /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
+ "wx/object.h"
+ "wx/list.h"
+ "wx/filefn.h"
+ "wx/hashmap.h"
+ "wx/versioninfo.h"
+ "wx/meta/implicitconversion.h"
+ "wx/gdicmn.h"
+ "wx/mousestate.h"
+ "wx/longlong.h"
+ "wx/platinfo.h"
+ <direct.h>
+ <dirent.h>
+ <unistd.h>
+ <stdio.h>
+
+1307765963 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filefn.h
+ "wx/list.h"
+ "wx/arrstr.h"
+ "wx/msw/wince/time.h"
+ "wx/msw/private.h"
+ <time.h>
+ <sys/types.h>
+ <sys/stat.h>
+ <sys/types.h>
+ <utime.h>
+ <sys/stat.h>
+ <unistd.h>
+ <stat.h>
+ <unistd.h>
+ <unix.h>
+ <process.h>
+ "wx/os2/private.h"
+ <direct.h>
+ <io.h>
+ <unistd.h>
+ <unistd.h>
+ <dirent.h>
+ <direct.h>
+ <dos.h>
+ <io.h>
+ <direct.h>
+ <dos.h>
+ <io.h>
+ <io.h>
+ <unistd.h>
+ <dir.h>
+ <fcntl.h>
+ <sys/types.h>
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/meta/if.h"
+
+1307765964 /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
+ "wx/defs.h"
+
+1307765964 /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
+ "wx/defs.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/fontenc.h"
+ "wx/gdiobj.h"
+ "wx/gdicmn.h"
+ "wx/palmos/font.h"
+ "wx/msw/font.h"
+ "wx/motif/font.h"
+ "wx/gtk/font.h"
+ "wx/gtk1/font.h"
+ "wx/x11/font.h"
+ "wx/mgl/font.h"
+ "wx/dfb/font.h"
+ "wx/osx/font.h"
+ "wx/cocoa/font.h"
+ "wx/os2/font.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/gdiobj.h"
+ "wx/variant.h"
+ "wx/generic/colour.h"
+ "wx/msw/colour.h"
+ "wx/motif/colour.h"
+ "wx/gtk/colour.h"
+ "wx/gtk1/colour.h"
+ "wx/generic/colour.h"
+ "wx/generic/colour.h"
+ "wx/x11/colour.h"
+ "wx/osx/colour.h"
+ "wx/cocoa/colour.h"
+ "wx/os2/colour.h"
+
+1307765965 /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
+ "wx/gdiobj.h"
+ "wx/gdicmn.h"
+ "wx/palmos/region.h"
+ "wx/msw/region.h"
+ "wx/gtk/region.h"
+ "wx/gtk1/region.h"
+ "wx/x11/region.h"
+ "wx/mgl/region.h"
+ "wx/dfb/region.h"
+ "wx/osx/region.h"
+ "wx/cocoa/region.h"
+ "wx/os2/region.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/event.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/palette.h
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/gdiobj.h"
+ "wx/palmos/palette.h"
+ "wx/msw/palette.h"
+ "wx/x11/palette.h"
+ "wx/generic/paletteg.h"
+ "wx/mgl/palette.h"
+ "wx/osx/palette.h"
+ "wx/os2/palette.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/generic/accel.h"
+ "wx/msw/accel.h"
+ "wx/motif/accel.h"
+ "wx/gtk/accel.h"
+ "wx/gtk1/accel.h"
+ "wx/osx/accel.h"
+ "wx/generic/accel.h"
+ "wx/os2/accel.h"
+
+1307765964 /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
+
+1307765965 /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
+
+1307765966 /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
+ "wx/colour.h"
+ "wx/font.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/wx.h
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/dynarray.h"
+ "wx/list.h"
+ "wx/hash.h"
+ "wx/string.h"
+ "wx/hashmap.h"
+ "wx/arrstr.h"
+ "wx/intl.h"
+ "wx/log.h"
+ "wx/event.h"
+ "wx/app.h"
+ "wx/utils.h"
+ "wx/stream.h"
+ "wx/memory.h"
+ "wx/math.h"
+ "wx/stopwatch.h"
+ "wx/timer.h"
+ "wx/module.h"
+ "wx/wxcrt.h"
+ "wx/wxcrtvararg.h"
+ "wx/window.h"
+ "wx/containr.h"
+ "wx/panel.h"
+ "wx/toplevel.h"
+ "wx/frame.h"
+ "wx/gdicmn.h"
+ "wx/gdiobj.h"
+ "wx/region.h"
+ "wx/bitmap.h"
+ "wx/image.h"
+ "wx/colour.h"
+ "wx/font.h"
+ "wx/dc.h"
+ "wx/dcclient.h"
+ "wx/dcmemory.h"
+ "wx/dcprint.h"
+ "wx/dcscreen.h"
+ "wx/button.h"
+ "wx/menuitem.h"
+ "wx/menu.h"
+ "wx/pen.h"
+ "wx/brush.h"
+ "wx/palette.h"
+ "wx/icon.h"
+ "wx/cursor.h"
+ "wx/dialog.h"
+ "wx/settings.h"
+ "wx/msgdlg.h"
+ "wx/dataobj.h"
+ "wx/control.h"
+ "wx/ctrlsub.h"
+ "wx/bmpbuttn.h"
+ "wx/checkbox.h"
+ "wx/checklst.h"
+ "wx/choice.h"
+ "wx/scrolbar.h"
+ "wx/stattext.h"
+ "wx/statbmp.h"
+ "wx/statbox.h"
+ "wx/listbox.h"
+ "wx/radiobox.h"
+ "wx/radiobut.h"
+ "wx/textctrl.h"
+ "wx/slider.h"
+ "wx/gauge.h"
+ "wx/scrolwin.h"
+ "wx/dirdlg.h"
+ "wx/toolbar.h"
+ "wx/combobox.h"
+ "wx/layout.h"
+ "wx/sizer.h"
+ "wx/statusbr.h"
+ "wx/choicdlg.h"
+ "wx/textdlg.h"
+ "wx/filedlg.h"
+ "wx/mdi.h"
+ "wx/validate.h"
+ "wx/valtext.h"
+
+1307765963 /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
+ "wx/event.h"
+ "wx/build.h"
+ "wx/cmdargs.h"
+ "wx/init.h"
+ "wx/intl.h"
+ "wx/log.h"
+ "wx/unix/app.h"
+ "wx/palmos/app.h"
+ "wx/msw/app.h"
+ "wx/motif/app.h"
+ "wx/mgl/app.h"
+ "wx/dfb/app.h"
+ "wx/gtk/app.h"
+ "wx/gtk1/app.h"
+ "wx/x11/app.h"
+ "wx/osx/app.h"
+ "wx/cocoa/app.h"
+ "wx/os2/app.h"
+ "wx/univ/theme.h"
+
+1307765963 /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
+ "wx/arrstr.h"
+
+1307765963 /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
+ "wx/event.h"
+ "wx/icon.h"
+ "wx/msw/wrapwin.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/icon.h
+ "wx/iconloc.h"
+ "wx/generic/icon.h"
+ "wx/msw/icon.h"
+ "wx/motif/icon.h"
+ "wx/generic/icon.h"
+ "wx/generic/icon.h"
+ "wx/generic/icon.h"
+ "wx/generic/icon.h"
+ "wx/generic/icon.h"
+ "wx/osx/icon.h"
+ "wx/generic/icon.h"
+ "wx/cocoa/icon.h"
+ "wx/os2/icon.h"
+ "wx/variant.h"
+
+1307765963 /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
+ "wx/msw/gdiimage.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stream.h
+ "wx/defs.h"
+ <stdio.h>
+ "wx/object.h"
+ "wx/string.h"
+ "wx/filefn.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/longlong.h"
+ "wx/event.h"
+ "wx/stopwatch.h"
+ "wx/utils.h"
+
+1307765964 /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
+ "wx/defs.h"
+
+1307765965 /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
+
+1307765964 /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
+ "wx/string.h"
+ "wx/gdicmn.h"
+ "wx/colour.h"
+ "wx/image.h"
+ "wx/variant.h"
+ "wx/palmos/bitmap.h"
+ "wx/msw/bitmap.h"
+ "wx/x11/bitmap.h"
+ "wx/gtk/bitmap.h"
+ "wx/gtk1/bitmap.h"
+ "wx/x11/bitmap.h"
+ "wx/mgl/bitmap.h"
+ "wx/dfb/bitmap.h"
+ "wx/osx/bitmap.h"
+ "wx/cocoa/bitmap.h"
+ "wx/os2/bitmap.h"
+ "wx/generic/mask.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/image.h
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/string.h"
+ "wx/gdicmn.h"
+ "wx/hashmap.h"
+ "wx/arrstr.h"
+ "wx/stream.h"
+ "wx/variant.h"
+ "wx/imagbmp.h"
+ "wx/imagpng.h"
+ "wx/imaggif.h"
+ "wx/imagpcx.h"
+ "wx/imagjpeg.h"
+ "wx/imagtga.h"
+ "wx/imagtiff.h"
+ "wx/imagpnm.h"
+ "wx/imagxpm.h"
+ "wx/imagiff.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/image.h"
+ "wx/versioninfo.h"
+
+1307765965 /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
+ "wx/image.h"
+
+1307765965 /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
+ "wx/image.h"
+
+1307765965 /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
+ "wx/image.h"
+
+1307765965 /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
+ "wx/image.h"
+
+1307765965 /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
+ "wx/nonownedwnd.h"
+ "wx/iconbndl.h"
+ "wx/containr.h"
+ "wx/weakref.h"
+ "wx/palmos/toplevel.h"
+ "wx/msw/toplevel.h"
+ "wx/gtk/toplevel.h"
+ "wx/gtk1/toplevel.h"
+ "wx/x11/toplevel.h"
+ "wx/mgl/toplevel.h"
+ "wx/dfb/toplevel.h"
+ "wx/osx/toplevel.h"
+ "wx/cocoa/toplevel.h"
+ "wx/os2/toplevel.h"
+ "wx/motif/toplevel.h"
+ "wx/univ/toplevel.h"
+
+1307765965 /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
+ "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
+ "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
+
+1307765966 /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
+ "wx/toplevel.h"
+ "wx/statusbr.h"
+ "wx/univ/frame.h"
+ "wx/palmos/frame.h"
+ "wx/msw/frame.h"
+ "wx/gtk/frame.h"
+ "wx/gtk1/frame.h"
+ "wx/motif/frame.h"
+ "wx/osx/frame.h"
+ "wx/cocoa/frame.h"
+ "wx/os2/frame.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/statusbr.h
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/list.h"
+ "wx/dynarray.h"
+ "wx/univ/statusbr.h"
+ "wx/palmos/statusbr.h"
+ "wx/msw/statusbar.h"
+ "wx/generic/statusbr.h"
+ "wx/osx/statusbr.h"
+ "wx/generic/statusbr.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/control.h
+ "wx/defs.h"
+ "wx/window.h"
+ "wx/univ/control.h"
+ "wx/palmos/control.h"
+ "wx/msw/control.h"
+ "wx/motif/control.h"
+ "wx/gtk/control.h"
+ "wx/gtk1/control.h"
+ "wx/osx/control.h"
+ "wx/cocoa/control.h"
+ "wx/os2/control.h"
+
+1307765965 /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
+ "wx/vector.h"
+ "wx/tooltip.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/vector.h
+ "wx/defs.h"
+ <vector>
+ <algorithm>
+ "wx/utils.h"
+ "wx/scopeguard.h"
+ "wx/meta/movable.h"
+ "wx/meta/if.h"
+ "wx/beforestd.h"
+ <new>
+ "wx/afterstd.h"
+
+1307765965 /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
+ "wx/defs.h"
+
+1307765964 /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
+ "wx/defs.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/tooltip.h
+ "wx/defs.h"
+ "wx/msw/tooltip.h"
+ "wx/gtk/tooltip.h"
+ "wx/gtk1/tooltip.h"
+ "wx/osx/tooltip.h"
+ "wx/cocoa/tooltip.h"
+ "wx/os2/tooltip.h"
+
+1307765966 /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
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dc.h
+ "wx/object.h"
+ "wx/intl.h"
+ "wx/cursor.h"
+ "wx/font.h"
+ "wx/colour.h"
+ "wx/bitmap.h"
+ "wx/brush.h"
+ "wx/pen.h"
+ "wx/palette.h"
+ "wx/dynarray.h"
+ "wx/math.h"
+ "wx/image.h"
+ "wx/region.h"
+ "wx/affinematrix2d.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/brush.h
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/gdiobj.h"
+ "wx/gdicmn.h"
+ "wx/palmos/brush.h"
+ "wx/msw/brush.h"
+ "wx/x11/brush.h"
+ "wx/gtk/brush.h"
+ "wx/gtk1/brush.h"
+ "wx/mgl/brush.h"
+ "wx/dfb/brush.h"
+ "wx/osx/brush.h"
+ "wx/cocoa/brush.h"
+ "wx/os2/brush.h"
+
+1307765965 /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
+ "wx/gdiobj.h"
+ "wx/gdicmn.h"
+ "wx/palmos/pen.h"
+ "wx/msw/pen.h"
+ "wx/x11/pen.h"
+ "wx/gtk/pen.h"
+ "wx/gtk1/pen.h"
+ "wx/mgl/pen.h"
+ "wx/dfb/pen.h"
+ "wx/osx/pen.h"
+ "wx/cocoa/pen.h"
+ "wx/os2/pen.h"
+
+1307765966 /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
+ "wx/affinematrix2dbase.h"
+
+1307765964 /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
+ "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
+ "wx/dc.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/dc.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/bitmap.h"
+ "wx/control.h"
+ "wx/univ/button.h"
+ "wx/msw/button.h"
+ "wx/motif/button.h"
+ "wx/gtk/button.h"
+ "wx/gtk1/button.h"
+ "wx/osx/button.h"
+ "wx/cocoa/button.h"
+ "wx/os2/button.h"
+ "wx/palmos/button.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/object.h"
+ "wx/univ/menuitem.h"
+ "wx/palmos/menuitem.h"
+ "wx/msw/menuitem.h"
+ "wx/motif/menuitem.h"
+ "wx/gtk/menuitem.h"
+ "wx/gtk1/menuitem.h"
+ "wx/osx/menuitem.h"
+ "wx/cocoa/menuitem.h"
+ "wx/os2/menuitem.h"
+
+1307765965 /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
+ "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
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/menu.h
+ "wx/defs.h"
+ "wx/list.h"
+ "wx/window.h"
+ "wx/menuitem.h"
+ "wx/univ/menu.h"
+ "wx/palmos/menu.h"
+ "wx/msw/menu.h"
+ "wx/motif/menu.h"
+ "wx/gtk/menu.h"
+ "wx/gtk1/menu.h"
+ "wx/osx/menu.h"
+ "wx/cocoa/menu.h"
+ "wx/os2/menu.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/toplevel.h"
+ "wx/univ/dialog.h"
+ "wx/palmos/dialog.h"
+ "wx/msw/dialog.h"
+ "wx/motif/dialog.h"
+ "wx/gtk/dialog.h"
+ "wx/gtk1/dialog.h"
+ "wx/osx/dialog.h"
+ "wx/cocoa/dialog.h"
+ "wx/os2/dialog.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/dialog.h"
+ "wx/stockitem.h"
+ "wx/generic/msgdlgg.h"
+ "wx/cocoa/msgdlg.h"
+ "wx/palmos/msgdlg.h"
+ "wx/msw/msgdlg.h"
+ "wx/motif/msgdlg.h"
+ "wx/gtk/msgdlg.h"
+ "wx/osx/msgdlg.h"
+ "wx/os2/msgdlg.h"
+
+1307765964 /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
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/bitmap.h"
+ "wx/list.h"
+ "wx/arrstr.h"
+ "wx/msw/ole/dataform.h"
+ "wx/motif/dataform.h"
+ "wx/gtk/dataform.h"
+ "wx/gtk1/dataform.h"
+ "wx/x11/dataform.h"
+ "wx/osx/dataform.h"
+ "wx/cocoa/dataform.h"
+ "wx/os2/dataform.h"
+ "wx/msw/ole/dataobj.h"
+ "wx/motif/dataobj.h"
+ "wx/x11/dataobj.h"
+ "wx/gtk/dataobj.h"
+ "wx/gtk1/dataobj.h"
+ "wx/osx/dataobj.h"
+ "wx/cocoa/dataobj.h"
+ "wx/os2/dataobj.h"
+ "wx/msw/ole/dataobj2.h"
+ "wx/gtk/dataobj2.h"
+ "wx/gtk1/dataobj2.h"
+ "wx/x11/dataobj2.h"
+ "wx/motif/dataobj2.h"
+ "wx/osx/dataobj2.h"
+ "wx/cocoa/dataobj2.h"
+ "wx/os2/dataobj2.h"
+
+1307765966 /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
+
+1307765966 /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
+ "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
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/bmpbuttn.h
+ "wx/defs.h"
+ "wx/button.h"
+ "wx/univ/bmpbuttn.h"
+ "wx/msw/bmpbuttn.h"
+ "wx/motif/bmpbuttn.h"
+ "wx/gtk/bmpbuttn.h"
+ "wx/gtk1/bmpbuttn.h"
+ "wx/osx/bmpbuttn.h"
+ "wx/cocoa/bmpbuttn.h"
+ "wx/os2/bmpbuttn.h"
+ "wx/palmos/bmpbuttn.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/checkbox.h"
+ "wx/msw/checkbox.h"
+ "wx/motif/checkbox.h"
+ "wx/gtk/checkbox.h"
+ "wx/gtk1/checkbox.h"
+ "wx/osx/checkbox.h"
+ "wx/cocoa/checkbox.h"
+ "wx/os2/checkbox.h"
+ "wx/palmos/checkbox.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/listbox.h"
+ "wx/univ/checklst.h"
+ "wx/msw/wince/checklst.h"
+ "wx/msw/checklst.h"
+ "wx/motif/checklst.h"
+ "wx/gtk/checklst.h"
+ "wx/gtk1/checklst.h"
+ "wx/osx/checklst.h"
+ "wx/cocoa/checklst.h"
+ "wx/os2/checklst.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/listbox.h
+ "wx/defs.h"
+ "wx/ctrlsub.h"
+ "wx/univ/listbox.h"
+ "wx/msw/listbox.h"
+ "wx/motif/listbox.h"
+ "wx/gtk/listbox.h"
+ "wx/gtk1/listbox.h"
+ "wx/osx/listbox.h"
+ "wx/os2/listbox.h"
+ "wx/cocoa/listbox.h"
+
+1307765965 /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
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/choice.h
+ "wx/defs.h"
+ "wx/ctrlsub.h"
+ "wx/univ/choice.h"
+ "wx/msw/wince/choicece.h"
+ "wx/msw/choice.h"
+ "wx/motif/choice.h"
+ "wx/gtk/choice.h"
+ "wx/gtk1/choice.h"
+ "wx/osx/choice.h"
+ "wx/cocoa/choice.h"
+ "wx/os2/choice.h"
+ "wx/palmos/choice.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/scrolbar.h"
+ "wx/msw/scrolbar.h"
+ "wx/motif/scrolbar.h"
+ "wx/gtk/scrolbar.h"
+ "wx/gtk1/scrolbar.h"
+ "wx/osx/scrolbar.h"
+ "wx/cocoa/scrolbar.h"
+ "wx/os2/scrolbar.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/stattext.h"
+ "wx/msw/stattext.h"
+ "wx/motif/stattext.h"
+ "wx/gtk/stattext.h"
+ "wx/gtk1/stattext.h"
+ "wx/osx/stattext.h"
+ "wx/cocoa/stattext.h"
+ "wx/os2/stattext.h"
+ "wx/palmos/stattext.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/bitmap.h"
+ "wx/icon.h"
+ "wx/univ/statbmp.h"
+ "wx/msw/statbmp.h"
+ "wx/motif/statbmp.h"
+ "wx/gtk/statbmp.h"
+ "wx/gtk1/statbmp.h"
+ "wx/osx/statbmp.h"
+ "wx/cocoa/statbmp.h"
+ "wx/os2/statbmp.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/statbox.h"
+ "wx/msw/statbox.h"
+ "wx/motif/statbox.h"
+ "wx/gtk/statbox.h"
+ "wx/gtk1/statbox.h"
+ "wx/osx/statbox.h"
+ "wx/cocoa/statbox.h"
+ "wx/os2/statbox.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/ctrlsub.h"
+ "wx/dynarray.h"
+ "wx/univ/radiobox.h"
+ "wx/msw/radiobox.h"
+ "wx/motif/radiobox.h"
+ "wx/gtk/radiobox.h"
+ "wx/gtk1/radiobox.h"
+ "wx/osx/radiobox.h"
+ "wx/cocoa/radiobox.h"
+ "wx/os2/radiobox.h"
+ "wx/palmos/radiobox.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/radiobut.h"
+ "wx/msw/radiobut.h"
+ "wx/motif/radiobut.h"
+ "wx/gtk/radiobut.h"
+ "wx/gtk1/radiobut.h"
+ "wx/osx/radiobut.h"
+ "wx/cocoa/radiobut.h"
+ "wx/os2/radiobut.h"
+ "wx/palmos/radiobut.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/textentry.h"
+ "wx/dynarray.h"
+ "wx/gdicmn.h"
+ "wx/ioswrap.h"
+ "wx/x11/textctrl.h"
+ "wx/univ/textctrl.h"
+ "wx/msw/wince/textctrlce.h"
+ "wx/msw/textctrl.h"
+ "wx/motif/textctrl.h"
+ "wx/gtk/textctrl.h"
+ "wx/gtk1/textctrl.h"
+ "wx/osx/textctrl.h"
+ "wx/cocoa/textctrl.h"
+ "wx/os2/textctrl.h"
+ "wx/palmos/textctrl.h"
+
+1307765965 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/textentry.h
+ "wx/gdicmn.h"
+ "wx/gtk/textentry.h"
+ "wx/osx/textentry.h"
+ "wx/msw/textentry.h"
+ "wx/motif/textentry.h"
+ "wx/os2/textentry.h"
+
+1307765966 /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
+ "wx/beforestd.h"
+ <iostream.h>
+ <iostream>
+ "wx/afterstd.h"
+ "wx/msw/winundef.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/slider.h"
+ "wx/msw/slider.h"
+ "wx/motif/slider.h"
+ "wx/gtk/slider.h"
+ "wx/gtk1/slider.h"
+ "wx/osx/slider.h"
+ "wx/cocoa/slider.h"
+ "wx/os2/slider.h"
+ "wx/palmos/slider.h"
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/univ/gauge.h"
+ "wx/msw/gauge.h"
+ "wx/motif/gauge.h"
+ "wx/gtk/gauge.h"
+ "wx/gtk1/gauge.h"
+ "wx/osx/gauge.h"
+ "wx/cocoa/gauge.h"
+ "wx/os2/gauge.h"
+
+1307765965 /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
+ "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
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dirdlg.h
+ "wx/dialog.h"
+ "wx/generic/dirdlgg.h"
+ "wx/generic/dirdlgg.h"
+ "wx/generic/dirdlgg.h"
+ "wx/msw/dirdlg.h"
+ "wx/gtk/dirdlg.h"
+ "wx/generic/dirdlgg.h"
+ "wx/osx/dirdlg.h"
+ "wx/cocoa/dirdlg.h"
+ "wx/generic/dirdlgg.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/tbarbase.h"
+ "wx/univ/toolbar.h"
+ "wx/palmos/toolbar.h"
+ "wx/msw/toolbar.h"
+ "wx/msw/wince/tbarwce.h"
+ "wx/motif/toolbar.h"
+ "wx/gtk/toolbar.h"
+ "wx/gtk1/toolbar.h"
+ "wx/osx/toolbar.h"
+ "wx/cocoa/toolbar.h"
+ "wx/os2/toolbar.h"
+
+1307765965 /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
+ "wx/dynarray.h"
+ "wx/imaglist.h"
+
+1307765965 /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
+ "wx/bitmap.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/combobox.h
+ "wx/defs.h"
+ "wx/ctrlsub.h"
+ "wx/textentry.h"
+ "wx/univ/combobox.h"
+ "wx/msw/combobox.h"
+ "wx/motif/combobox.h"
+ "wx/gtk/combobox.h"
+ "wx/gtk1/combobox.h"
+ "wx/osx/combobox.h"
+ "wx/cocoa/combobox.h"
+ "wx/os2/combobox.h"
+
+1307765965 /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
+ "wx/object.h"
+
+1307765965 /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
+ "wx/generic/choicdgg.h"
+
+1307765964 /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
+ "wx/generic/textdlgg.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/validate.h"
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/filedlg.h
+ "wx/defs.h"
+ "wx/dialog.h"
+ "wx/arrstr.h"
+ "wx/generic/filedlgg.h"
+ "wx/msw/filedlg.h"
+ "wx/motif/filedlg.h"
+ "wx/gtk/filedlg.h"
+ "wx/gtk1/filedlg.h"
+ "wx/osx/filedlg.h"
+ "wx/cocoa/filedlg.h"
+ "wx/os2/filedlg.h"
+ "wx/generic/filedlgg.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/frame.h"
+ "wx/menu.h"
+ "wx/generic/mdig.h"
+ "wx/msw/mdi.h"
+ "wx/gtk/mdi.h"
+ "wx/gtk1/mdi.h"
+ "wx/osx/mdi.h"
+ "wx/cocoa/mdi.h"
+
+1307765965 /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
+ "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
+ "wx/defs.h"
+ "wx/dynarray.h"
+ "wx/gdicmn.h"
+ "wx/window.h"
+ "wx/timer.h"
+ "wx/sizer.h"
+ "wx/bitmap.h"
+
+1307765966 /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
+ "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
+ "wx/defs.h"
+ "wx/palmos/minifram.h"
+ "wx/msw/minifram.h"
+ "wx/motif/minifram.h"
+ "wx/gtk/minifram.h"
+ "wx/gtk1/minifram.h"
+ "wx/x11/minifram.h"
+ "wx/osx/minifram.h"
+ "wx/os2/minifram.h"
+ "wx/frame.h"
+
+1307765965 /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
+ "wx/aui/framemanager.h"
+ "wx/aui/dockart.h"
+ "wx/aui/floatpane.h"
+ "wx/aui/auibar.h"
+ "wx/aui/auibook.h"
+ "wx/aui/tabmdi.h"
+
+1307765966 /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
+ "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
+ "wx/defs.h"
+ "wx/bookctrl.h"
+ "wx/univ/notebook.h"
+ "wx/msw/notebook.h"
+ "wx/generic/notebook.h"
+ "wx/gtk/notebook.h"
+ "wx/gtk1/notebook.h"
+ "wx/osx/notebook.h"
+ "wx/cocoa/notebook.h"
+ "wx/os2/notebook.h"
+
+1307765965 /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
+ "wx/defs.h"
+ "wx/bookctrl.h"
+ "wx/choice.h"
+
+1307765965 /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
+ "wx/event.h"
+ "wx/control.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/calctrl.h
+ "wx/defs.h"
+ "wx/dateevt.h"
+ "wx/colour.h"
+ "wx/font.h"
+ "wx/control.h"
+ "wx/gtk/calctrl.h"
+ "wx/msw/calctrl.h"
+ "wx/generic/calctrlg.h"
+
+1307765966 /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
+
+1307765966 /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
+ "wx/defs.h"
+ "wx/window.h"
+ "wx/scrolwin.h"
+ "wx/config.h"
+ "wx/stopwatch.h"
+ "wx/html/winpars.h"
+ "wx/html/htmlcell.h"
+ "wx/filesys.h"
+ "wx/html/htmlfilt.h"
+ "wx/filename.h"
+ "wx/bitmap.h"
+
+1307765963 /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
+ "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
+ "wx/string.h"
+ "wx/buffer.h"
+
+1307765964 /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
+ "wx/defs.h"
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/textbuf.h"
+ "wx/file.h"
+
+1307765964 /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
+ "wx/strconv.h"
+ "wx/fontenc.h"
+
+1307765963 /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
+ "wx/arrstr.h"
+ "wx/filefn.h"
+ "wx/datetime.h"
+ "wx/intl.h"
+ "wx/longlong.h"
+ "wx/file.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/winpars.h
+ "wx/defs.h"
+ "wx/module.h"
+ "wx/font.h"
+ "wx/html/htmlpars.h"
+ "wx/html/htmlcell.h"
+ "wx/encconv.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/html/htmlpars.h
+ "wx/defs.h"
+ "wx/html/htmltag.h"
+ "wx/filesys.h"
+ "wx/hashmap.h"
+ "wx/hashset.h"
+ "wx/vector.h"
+ "wx/fontenc.h"
+
+1307765966 /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
+ "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
+ "wx/hashmap.h"
+ <unordered_set>
+ <tr1/unordered_set>
+ <ext/hash_set>
+ <hash_set>
+
+1307765966 /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
+ "wx/defs.h"
+
+1307765963 /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
+ "wx/defs.h"
+ "wx/filesys.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/datectrl.h
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/datetime.h"
+ "wx/palmos/datectrl.h"
+ "wx/msw/datectrl.h"
+ "wx/generic/datectrl.h"
+
+1307765966 /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
+ "wx/compositewin.h"
+
+1307765964 /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
+ "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
+ "wx/dialog.h"
+
+1307765966 /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
+ "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
+ "wx/defs.h"
+ "wx/control.h"
+ "wx/treebase.h"
+ "wx/textctrl.h"
+ "wx/generic/treectlg.h"
+ "wx/generic/treectlg.h"
+ "wx/msw/treectrl.h"
+ "wx/generic/treectlg.h"
+ "wx/generic/treectlg.h"
+ "wx/generic/treectlg.h"
+ "wx/generic/treectlg.h"
+ "wx/generic/treectlg.h"
+
+1307765965 /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
+ "wx/scrolwin.h"
+ "wx/pen.h"
+
+1307765966 /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
+ "wx/longlong.h"
+ "wx/string.h"
+ "wx/filefn.h"
+
+1307765963 /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"
+ <stdio.h>
+
+1307765964 /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
+ "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
+ "wx/defs.h"
+ "wx/app.h"
+ "wx/palette.h"
+ "wx/window.h"
+ "wx/msw/glcanvas.h"
+ "wx/x11/glcanvas.h"
+ "wx/gtk/glcanvas.h"
+ "wx/gtk1/glcanvas.h"
+ "wx/osx/glcanvas.h"
+ "wx/cocoa/glcanvas.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/glcanvas.h
+ "wx/palette.h"
+ "wx/msw/wrapwin.h"
+ <GL/gl.h>
+
+1307765964 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stdpaths.h
+ "wx/defs.h"
+ "wx/string.h"
+ "wx/filefn.h"
+ "wx/msw/stdpaths.h"
+ "wx/osx/core/stdpaths.h"
+ "wx/os2/stdpaths.h"
+ "wx/unix/stdpaths.h"
+ "wx/palmos/stdpaths.h"
+
+1307765964 /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
+ "wx/defs.h"
+ "wx/app.h"
+ "wx/icon.h"
+
+1307765966 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/dcbuffer.h
+ "wx/dcmemory.h"
+ "wx/dcclient.h"
+ "wx/window.h"
+
diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout
index 0cbd7528..5ce345ab 100644
--- a/Projects/CodeBlocks/SleepyHead.layout
+++ b/Projects/CodeBlocks/SleepyHead.layout
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
- <ActiveTarget name="Windows" />
+ <ActiveTarget name="Debug" />
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14">
<Cursor position="1300" topLine="24" />
</File>
@@ -11,27 +11,27 @@
<Cursor position="1042" topLine="7" />
</File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
- <Cursor position="27102" topLine="704" />
+ <Cursor position="1118" topLine="28" />
</File>
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
- <Cursor position="2209" topLine="51" />
+ <Cursor position="602" topLine="0" />
</File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="7">
- <Cursor position="31250" topLine="1140" />
+ <Cursor position="17989" topLine="662" />
</File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="8">
- <Cursor position="11883" topLine="297" />
+ <Cursor position="7297" topLine="179" />
</File>
<File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="7148" topLine="269" />
</File>
- <File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="1" top="0" tabpos="12">
+ <File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="0" top="0" tabpos="12">
<Cursor position="7484" topLine="237" />
</File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.h" open="0" top="0" tabpos="5">
<Cursor position="579" topLine="0" />
</File>
- <File name="../../src/libs/sleeplib/loader_plugins/zeo_loader.cpp" open="1" top="0" tabpos="13">
+ <File name="../../src/libs/sleeplib/loader_plugins/zeo_loader.cpp" open="0" top="0" tabpos="13">
<Cursor position="1662" topLine="27" />
</File>
<File name="../../src/libs/sleeplib/machine.cpp" open="1" top="0" tabpos="5">
@@ -40,7 +40,7 @@
<File name="../../src/libs/sleeplib/machine.h" open="1" top="0" tabpos="4">
<Cursor position="5047" topLine="119" />
</File>
- <File name="../../src/libs/sleeplib/machine_loader.h" open="1" top="0" tabpos="14">
+ <File name="../../src/libs/sleeplib/machine_loader.h" open="0" top="0" tabpos="14">
<Cursor position="222" topLine="0" />
</File>
<File name="../../src/libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="10">
@@ -52,7 +52,7 @@
<File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="6">
<Cursor position="13397" topLine="309" />
</File>
- <File name="../../src/libs/sleeplib/prs1_loader.h" open="1" top="0" tabpos="11">
+ <File name="../../src/libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="11">
<Cursor position="622" topLine="0" />
</File>
</CodeBlocks_layout_file>
diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp
index 55c631ea..9e3da690 100644
--- a/src/SleepyHeadMain.cpp
+++ b/src/SleepyHeadMain.cpp
@@ -41,6 +41,7 @@
//extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;
//#endif
+
wxProgressDialog *loader_progress;
//helper functions
enum wxbuildinfoformat {
diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp
index 6bc0d704..71c99786 100644
--- a/src/graphs/graph.cpp
+++ b/src/graphs/graph.cpp
@@ -8,31 +8,42 @@ License: LGPL
#include <wx/settings.h>
#include <wx/dcbuffer.h>
#include <wx/graphics.h>
+#include <wx/glcanvas.h>
#include <wx/log.h>
#include <math.h>
#include "graph.h"
#include "sleeplib/profiles.h"
+#if !wxUSE_GLCANVAS
+ #error "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the wx library"
+#endif
+
+
#if !wxCHECK_VERSION(2,9,0)
wxColor zwxYELLOW=wxColor(0xb0,0xb0,0x40,0xff);
wxColor *wxYELLOW=&zwxYELLOW;
#endif
wxColor zwxAQUA=wxColor(0x00,0xaf,0xbf,0xff);
wxColor * wxAQUA=&zwxAQUA;
+
wxColor zwxPURPLE=wxColor(0xff,0x40,0xff,0xff);
wxColor * wxPURPLE=&zwxPURPLE;
+
wxColor zwxGREEN2=wxColor(0x40,0xff,0x40,0x5f);
wxColor * wxGREEN2=&zwxGREEN2;
+
wxColor zwxLIGHT_YELLOW(228,228,168,255);
wxColor *wxLIGHT_YELLOW=&zwxLIGHT_YELLOW;
wxColor zwxDARK_GREEN=wxColor(20,128,20,255);
wxColor *wxDARK_GREEN=&zwxDARK_GREEN;
+
wxColor zwxDARK_GREY(0xA0,0xA0,0xA0,0xA0);
wxColor *wxDARK_GREY=&zwxDARK_GREY;
wxFont *smallfont=NULL,*bigfont=NULL,*boldfont=NULL;
bool gfont_init=false;
+
// Must be called from a thread inside the application.
void GraphInit()
{
@@ -129,13 +140,13 @@ gLayer::~gLayer()
}
-void gLayer::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gLayer::Plot(wxDC & dc, gGraphWindow & w)
{
}
-IMPLEMENT_DYNAMIC_CLASS(gGraphWindow, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(gGraphWindow, wxGLCanvas)
BEGIN_EVENT_TABLE(gGraphWindow, wxWindow)
EVT_PAINT (gGraphWindow::OnPaint)
@@ -153,8 +164,18 @@ BEGIN_EVENT_TABLE(gGraphWindow, wxWindow)
END_EVENT_TABLE()
+ //wxGLCanvas (wxWindow *parent, wxWindowID id=wxID_ANY, const int *attribList=NULL, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=0, const wxString &name="GLCanvas", const wxPalette &palette=wxNullPalette)
+
+
+static int wx_gl_attribs[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 24, 0};
+
+gGraphWindow::gGraphWindow()
+: wxGLCanvas( NULL,wxID_ANY,NULL )
+{
+}
+
gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & title,const wxPoint &pos,const wxSize &size,long flags)
-: wxWindow( parent, id, pos, size, flags, title )
+: wxGLCanvas( parent, (wxGLCanvas *)NULL, id, pos, size, flags, title, (int *)wx_gl_attribs, wxNullPalette )
{
//GraphInit();
m_scrX = m_scrY = 64;
@@ -171,6 +192,8 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl
m_foobar_moved=0;
gtitle=foobar=xaxis=yaxis=NULL;
+ gl_context=new wxGLContext(this,NULL);
+
AddLayer(new gGraphTitle(title,wxVERTICAL,boldfont));
}
@@ -178,6 +201,8 @@ gGraphWindow::~gGraphWindow()
{
for (list<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) delete (*l);
layers.clear();
+
+ delete gl_context;
}
@@ -599,7 +624,7 @@ void gGraphWindow::Update()
{
Refresh();
}
-void gGraphWindow::SetMargins(int top, int right, int bottom, int left)
+void gGraphWindow::SetMargins(float top, float right, float bottom, float left)
{
m_marginTop=top;
m_marginBottom=bottom;
@@ -625,30 +650,144 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
//wxBrush brush( GetBackgroundColour() );
//dc.SetBrush( brush );
// dc.DrawRectangle(r);
- wxGraphicsContext *gc = wxGraphicsContext::Create(dc);
for (list<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) {
- (*l)->Plot(dc,*gc,*this);
+ (*l)->Plot(dc,*this);
}
dc.SelectObject(wxNullBitmap);
return bmp;
}
+void RoundedRectangle(int x,int y,int w,int h,int radius,const wxColor & color)
+{
+ glDisable(GL_TEXTURE_2D);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+ glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha());
+
+ glBegin(GL_POLYGON);
+ glVertex2i(x+radius,y);
+ glVertex2i(x+w-radius,y);
+ for(float i=(float)M_PI*1.5f;i<M_PI*2;i+=0.1f)
+ glVertex2f(x+w-radius+cos(i)*radius,y+radius+sin(i)*radius);
+ glVertex2i(x+w,y+radius);
+ glVertex2i(x+w,y+h-radius);
+ for(float i=0;i<(float)M_PI*0.5f;i+=0.1f)
+ glVertex2f(x+w-radius+cos(i)*radius,y+h-radius+sin(i)*radius);
+ glVertex2i(x+w-radius,y+h);
+ glVertex2i(x+radius,y+h);
+ for(float i=(float)M_PI*0.5f;i<M_PI;i+=0.1f)
+ glVertex2f(x+radius+cos(i)*radius,y+h-radius+sin(i)*radius);
+ glVertex2i(x,y+h-radius);
+ glVertex2i(x,y+radius);
+ for(float i=(float)M_PI;i<M_PI*1.5f;i+=0.1f)
+ glVertex2f(x+radius+cos(i)*radius,y+radius+sin(i)*radius);
+ glEnd();
+
+ glEnable(GL_TEXTURE_2D);
+ glDisable(GL_BLEND);
+}
+
+void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,wxColor & color)
+{
+ glDisable(GL_TEXTURE_2D);
+ glShadeModel(GL_SMOOTH);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+ glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha());
+ glLineWidth((GLfloat)lw);
+
+ glBegin(GL_LINE_STRIP);
+ for(float i=(float)M_PI;i<=1.5f*M_PI;i+=0.1f)
+ glVertex2f(radius*cos(i)+x+radius,radius*sin(i)+y+radius);
+ for(float i=1.5f*(float)M_PI;i<=2*M_PI; i+=0.1f)
+ glVertex2f(radius*cos(i)+x+w-radius,radius*sin(i)+y+radius);
+ for(float i=0;i<=0.5f*M_PI; i+=0.1f)
+ glVertex2f(radius*cos(i)+x+w-radius,radius*sin(i)+y+h-radius);
+ for(float i=0.5f*(float)M_PI;i<=M_PI;i+=0.1f)
+ glVertex2f(radius*cos(i)+x+radius,radius*sin(i)+y+h-radius);
+ glVertex2i(x,y+radius);
+ glEnd();
+
+ glEnable(GL_TEXTURE_2D);
+ glDisable(GL_BLEND);
+}
+
+
void gGraphWindow::OnPaint(wxPaintEvent& event)
{
-
-#if defined(__WXMSW__)
- wxAutoBufferedPaintDC dc(this);
-#else
+//#if defined(__WXMSW__)
+// wxAutoBufferedPaintDC dc(this);
+//#else
wxPaintDC dc(this);
-#endif
+//#endif
+ GetClientSize(&m_scrX, &m_scrY);
+
+ gl_context->SetCurrent(*this); // A generic Context needs to be used.. Not one per graph window
+
+ glViewport(0, 0, m_scrX, m_scrY);
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+
+ glOrtho(0, m_scrX, m_scrY, 0, -1, 1);
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+
+
+ //glMatrixMode(GL_PROJECTION);
+ //glPushMatrix();
+ //glLoadIdentity();
+ glDisable(GL_DEPTH_TEST);
+
+// glMatrixMode(GL_MODELVIEW);
+ // glLoadIdentity();
+ glDisable(GL_LIGHTING);
+
+ glBegin(GL_QUADS);
+ glColor3f(1.0,1.0,1.0); // Gradient start
+ glVertex2f(0, m_scrY);
+ glVertex2f(0, 0);
+
+ glColor3f(0.8,0.8,1.0); // Gradient End
+ glVertex2f(m_scrX, 0);
+ glVertex2f(m_scrX, m_scrY);
+ glEnd();
+
+ //glMatrixMode(GL_PROJECTION);
+ //glPopMatrix();
+ //glMatrixMode(GL_MODELVIEW);
+
+ for (list<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) {
+ /*if (dynamic_cast<gLineChart *>(*l)) {
+ (*l)->Plot(dc,*this);
+ }
+ if (dynamic_cast<gFooBar *>(*l)) {
+ (*l)->Plot(dc,*this);
+ } */
+ (*l)->Plot(dc,*this);
+ }
+
+ if (m_mouseLDown) {
+ if (m_mouseRBrect.width>0)
+
+ RoundedRectangle(m_mouseRBrect.x,m_mouseRBrect.y,m_mouseRBrect.width-2,m_mouseRBrect.height,5,*wxGREEN2);
+ }
+
+ //glEnable(GL_DEPTH_TEST);
+
+ SwapBuffers();
+
+ //wxAutoBufferedPaintDC dc(this);
+
//#if defined(__WXMSW)
// wxGraphicsRenderer *render=wxGraphicsRenderer::GetDefaultRenderer();
// Create graphics context from it
// wxGraphicsContext *gc = render->CreateContextFromNativeWindow(this); //::Create(dc);
//#else
- wxGraphicsContext *gc = wxGraphicsContext::Create(dc); //::Create(dc);
+
+
+ /*wxGraphicsContext *gc = wxGraphicsContext::Create(dc); //::Create(dc);
//#endif
@@ -660,7 +799,6 @@ void gGraphWindow::OnPaint(wxPaintEvent& event)
//gc->SetAntialiasMode(wxANTIALIAS_NONE);
//->SetInterpolationQuality(wxINTERPOLATION_FAST);
- GetClientSize(&m_scrX, &m_scrY);
gc->SetPen( *wxTRANSPARENT_PEN );
@@ -681,28 +819,15 @@ void gGraphWindow::OnPaint(wxPaintEvent& event)
// gc->DrawRectangle(0,0,m_scrX,m_scrY);
//wxLogMessage(wxT("Paint"));
//dc.DrawText(m_title,m_marginLeft,3);
- for (list<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) {
- (*l)->Plot(dc,*gc,*this);
- }
static wxPen pen(*wxDARK_GREY, 1, wxSOLID);
static wxColor sel(128,128,128,128);
- static wxBrush brush2(sel,wxALPHA_TRANSPARENT) ;//*wxTRANSPARENT_BRUSH); //wxFDIAGONAL_HATCH);
+ static wxBrush brush2(sel,wxALPHA_TRANSPARENT) ;// *wxTRANSPARENT_BRUSH); //wxFDIAGONAL_HATCH);
- if (m_mouseLDown) {
- gc->SetPen(pen);
- //if (fruit) {
- gc->SetBrush(brush2);
- //} else {
- // gc->SetBrush(*wxTRANSPARENT_BRUSH);
- //}
- if (m_mouseRBrect.width>0)
- gc->DrawRectangle(m_mouseRBrect.x,m_mouseRBrect.y,m_mouseRBrect.width-2,m_mouseRBrect.height);
- }
//if (pref["UseAntiAliasing"]) {
//delete dcp;
- //}
- //event.Skip();
+ //} */
+ event.Skip();
}
void gGraphWindow::OnSize(wxSizeEvent& event)
{
@@ -946,7 +1071,7 @@ gXAxis::gXAxis(const wxColor * col)
gXAxis::~gXAxis()
{
}
-void gXAxis::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
{
float px,py;
//wxCoord x,y;
@@ -1027,11 +1152,17 @@ void gXAxis::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
py=start_py+height;
+ glLineWidth(0.25);
+ glColor3f(0,0,0);
for (double i=st3; i<=w.max_x; i+=min_tick/10.0) {
if (i<w.min_x) continue;
//px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
- dc.DrawLine(px,py,px,py+4);
+ glBegin(GL_LINES);
+ glVertex2f(px,py);
+ glVertex2f(px,py+4);
+ glEnd();
+ //dc.DrawLine(px,py,px,py+4);
}
//st=st3;
@@ -1064,7 +1195,13 @@ void gXAxis::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
}
px=w.x2p(i);
- dc.DrawLine(px,py,px,py+6);
+ glColor3f(0,0,0);
+ glBegin(GL_LINES);
+ glVertex2f(px,py);
+ glVertex2f(px,py+6);
+ glEnd();
+
+ //dc.DrawLine(px,py,px,py+6);
//dc.DrawLine(px+1,py,px+1,py+6);
y=x=0;
dc.GetTextExtent(fd,&x,&y); //,&descent,&leading);
@@ -1098,7 +1235,7 @@ gYAxis::gYAxis(const wxColor * col)
gYAxis::~gYAxis()
{
}
-void gYAxis::Plot(wxDC & dc, wxGraphicsContext & gc,gGraphWindow &w)
+void gYAxis::Plot(wxDC & dc, gGraphWindow &w)
{
static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0);
static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT);
@@ -1122,7 +1259,11 @@ void gYAxis::Plot(wxDC & dc, wxGraphicsContext & gc,gGraphWindow &w)
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
- dc.SetPen(*wxBLACK_PEN);
+
+ const wxColor & linecol1=*wxLIGHT_GREY;
+ const wxColor & linecol2=wxDARK_GREY;
+
+ //dc.SetPen(*wxBLACK_PEN);
dc.SetFont(*smallfont);
dc.SetTextForeground(*wxBLACK);
@@ -1152,17 +1293,31 @@ void gYAxis::Plot(wxDC & dc, wxGraphicsContext & gc,gGraphWindow &w)
min_ytick=0.25;
int ty,h;
+ glColor3f(0,0,0);
+ glLineWidth(0.25);
for (float i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
- dc.DrawLine(start_px-4, h, start_px, h);
+ glBegin(GL_LINES);
+ glVertex2f(start_px-4, h);
+ glVertex2f(start_px, h);
+ glEnd();
+
+ //dc.DrawLine(start_px-4, h, start_px, h);
}
- dc.SetPen(pen1);
+ //dc.SetPen(pen1);
+ glColor3f(linecol1.Red()/256.0, linecol1.Green()/256.0, linecol1.Blue()/256.0);
for (double i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
- if (m_show_minor_lines && (i > w.min_y))
- dc.DrawLine(start_px+1,h,start_px+width,h);
+ if (m_show_minor_lines && (i > w.min_y)) {
+ glBegin(GL_LINES);
+ glVertex2f(start_px+1, h);
+ glVertex2f(start_px+width, h);
+ glEnd();
+
+ //dc.DrawLine(start_px+1,h,start_px+width,h);
+ }
}
for (double i=w.min_y; i<=w.max_y; i+=min_ytick) {
@@ -1172,11 +1327,25 @@ void gYAxis::Plot(wxDC & dc, wxGraphicsContext & gc,gGraphWindow &w)
if (x>labelW) labelW=x;
h=(start_py+height)-ty;
dc.DrawText(fd,start_px-8-x,h - (y / 2));
- dc.SetPen(*wxBLACK_PEN);
- dc.DrawLine(start_px-6,h,start_px,h);
- dc.SetPen(pen2);
- if (m_show_major_lines && (i > w.min_y))
- dc.DrawLine(start_px+1,h,start_px+width,h);
+ //dc.SetPen(*wxBLACK_PEN);
+
+ glColor3f(0,0,0);
+ glBegin(GL_LINES);
+ glVertex2f(start_px-6, h);
+ glVertex2f(start_px, h);
+ glEnd();
+
+ //dc.DrawLine(start_px-6,h,start_px,h);
+ //dc.SetPen(pen2);
+ if (m_show_major_lines && (i > w.min_y)) {
+ glColor3f(linecol1.Red()/256.0, linecol1.Green()/256.0, linecol1.Blue()/256.0);
+
+ glBegin(GL_LINES);
+ glVertex2f(start_px+1, h);
+ glVertex2f(start_px+width, h);
+ glEnd();
+ //dc.DrawLine(start_px+1,h,start_px+width,h);
+ }
}
//dc.GetTextExtent(w.Title(),&x,&y);
//dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90);
@@ -1190,7 +1359,7 @@ gGraphTitle::gGraphTitle(const wxString & _title,wxOrientation o,const wxFont *
gGraphTitle::~gGraphTitle()
{
}
-void gGraphTitle::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gGraphTitle::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
int scrx = w.GetScrX();
@@ -1228,7 +1397,7 @@ gFooBar::gFooBar(const wxColor * col1,const wxColor * col2)
gFooBar::~gFooBar()
{
}
-void gFooBar::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gFooBar::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
@@ -1241,21 +1410,29 @@ void gFooBar::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
- int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
- int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
+ int width=scrx - (w.GetLeftMargin() + w.GetRightMargin());
+ int height=scry - (w.GetTopMargin() + w.GetBottomMargin());
- wxPen pen2(*color[0], 1, wxDOT);
- wxPen pen3(*color[1], 2, wxSOLID);
+ const wxColor & col1=*color[0];
+ const wxColor & col2=*color[1];
+
+ glColor3f(col1.Red()/256.0, col1.Green()/256.0, col1.Blue()/256.0);
+ glLineWidth(1);
+ glBegin(GL_LINES);
+ glVertex2f(start_px, start_py+height+10);
+ glVertex2f(start_px+width, start_py+height+10);
+ glEnd();
- dc.SetPen( pen2 );
- dc.DrawLine(start_px, start_py+height+10, start_px+width, start_py+height+10);
double rmx=w.rmax_x-w.rmin_x;
double px=((1/rmx)*(w.min_x-w.rmin_x))*width;
double py=((1/rmx)*(w.max_x-w.rmin_x))*width;
- dc.SetPen(pen3);
- dc.DrawLine(start_px+px, start_py+height+10, start_px+py, start_py+height+10);
- dc.DrawLine(start_px+px, start_py+height+8, start_px+px, start_py+height+12);
- dc.DrawLine(start_px+py, start_py+height+8, start_px+py, start_py+height+12);
+
+ glColor3f (col2.Red()/256.0, col2.Green()/256.0, col2.Blue()/256.0);
+ glLineWidth(4);
+ glBegin(GL_LINES);
+ glVertex2f(start_px+px, start_py+height+10);
+ glVertex2f(start_px+py, start_py+height+10);
+ glEnd();
}
gCandleStick::gCandleStick(gPointData *d,wxOrientation o)
@@ -1266,7 +1443,7 @@ gCandleStick::gCandleStick(gPointData *d,wxOrientation o)
gCandleStick::~gCandleStick()
{
}
-void gCandleStick::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gCandleStick::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
if (!data) return;
@@ -1366,7 +1543,7 @@ gBarChart::~gBarChart()
delete Xaxis;
}
-void gBarChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
if (!data) return;
@@ -1417,7 +1594,7 @@ void gBarChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
for (int i=0;i<data->np[0];i++) {
if (data->point[0][i].m_x < w.min_x) continue;
if (data->point[0][i].m_x >= w.max_x) break;
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ //dc.SetBrush(*wxTRANSPARENT_BRUSH);
t1=px;
px+=barwidth+1;
t2=px-t1-1;
@@ -1434,8 +1611,10 @@ void gBarChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
rect=wxRect(t1,u1,t2,u2);
}
dir=wxEAST;
- dc.GradientFillLinear(rect,*color[0],*wxLIGHT_GREY,dir);
- dc.DrawRectangle(rect.x,rect.y,rect.width,rect.height);
+ RoundedRectangle(rect.x,rect.y,rect.width,rect.height,1,*color[0]); //,*wxLIGHT_GREY,dir);
+ wxColor c(0,0,0,255);
+ LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c);
+ //DrawRectangle(rect.x,rect.y,rect.width,rect.height);
str=FormatX(data->point[0][i].m_x);
textX=textY=0;
@@ -1451,7 +1630,7 @@ void gBarChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
}
if (draw_xticks_instead)
- Xaxis->Plot(dc,gc,w);
+ Xaxis->Plot(dc,w);
dc.DrawLine(start_px,start_py,start_px,start_py+height);
@@ -1478,7 +1657,7 @@ gLineChart::~gLineChart()
}
// Time Domain Line Chart
-void gLineChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
@@ -1508,10 +1687,18 @@ void gLineChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
// Draw bounding box if something else will be drawn.
if (!(!m_report_empty && !num_points)) {
- dc.SetPen( *wxBLACK_PEN );
+ glColor3f (0.1F, 0.1F, 0.1F);
+ glLineWidth (1);
+ glBegin (GL_LINE_LOOP);
+ glVertex2f (start_px, start_py);
+ glVertex2f (start_px, start_py+height);
+ glVertex2f (start_px+width,start_py+height);
+ glVertex2f (start_px+width, start_py);
+ glEnd ();
+/* dc.SetPen( *wxBLACK_PEN );
dc.DrawLine(start_px,start_py,start_px,start_py+height); // Left Border
dc.DrawLine(start_px,start_py+height,start_px+width+1,start_py+height); // Bottom Border
- dc.DrawLine(start_px+width+1,start_py,start_px+width+1,start_py+height+1); // Right Border
+ dc.DrawLine(start_px+width+1,start_py,start_px+width+1,start_py+height+1); // Right Border */
// dc.DrawLine(start_px,start_py,start_px+width,start_py);
}
@@ -1534,9 +1721,9 @@ void gLineChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
// Selected the plot line color
- wxPen pen(*color[0], 1, wxSOLID);
- dc.SetPen(pen);
+ const wxColor & col=*color[0];
+ glColor3f (col.Red()/256.0, col.Green()/256.0, col.Blue()/256.0);
bool accel=m_accelerate;
double px,py;
//double s1,s2;
@@ -1690,7 +1877,31 @@ void gLineChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
dp++;
//dc.DrawLine(start_px+i, start_py+, start_px+i, start_py+m_drawlist[i].y);
}
- if (dp>1) dc.DrawLines(dp,screen); // need at least two points
+
+
+ //glColor3f (col.Red(), col.Green(), col.Blue());
+ glLineWidth (0.25);
+ glBegin (GL_LINES); //_LOOP);
+ glEnable(GL_LINE_SMOOTH);
+ glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+ double lx,ly;
+ bool first=true;
+ for (int i=0;i<dp;i++) {
+ wxPoint &p=screen[i];
+ double x=p.x; //((scrx/double(width))*p.x);
+ double y=p.y; //((scry/double(height))*p.y);
+ if (first) {
+ first=false;
+ } else {
+ glVertex2f (lx, ly);
+ glVertex2f (x, y);
+ }
+ lx=x;
+ ly=y;
+ }
+ glEnd ();
+
+ //if (dp>1) dc.DrawLines(dp,screen); // need at least two points
} else if (dp>1) {
// Only the first point and last point should be in clipping range.
@@ -1732,8 +1943,29 @@ void gLineChart::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
- assert(siz>1);
- if (dp>1) dc.DrawLines(dp,m_drawlist); // need at least two points
+ //glColor3f (0.1F, 0.1F, 0.1F);
+ //glColor3f (col.Red(), col.Green(), col.Blue());
+ //glLineWidth (1);
+ glLineWidth (0.25);
+ glBegin (GL_LINES); //_LOOP);
+ glEnable(GL_LINE_SMOOTH);
+ glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+ double lx,ly;
+ bool first=true;
+ for (int i=0;i<dp;i++) {
+ wxPoint &p=m_drawlist[i];
+ double x=p.x; //((scrx/double(width))*p.x);
+ double y=p.y; //((scry/double(height))*p.y);
+ if (first) {
+ first=false;
+ } else {
+ glVertex2f (lx, ly);
+ glVertex2f (x, y);
+ }
+ lx=x;
+ ly=y;
+ }
+ glEnd ();
}
}
// dc.DestroyClippingRegion();
@@ -1749,7 +1981,7 @@ gLineOverlayBar::~gLineOverlayBar()
{
}
-void gLineOverlayBar::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
{
double x1,x2;
@@ -1774,13 +2006,15 @@ void gLineOverlayBar::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
double xx=w.max_x-w.min_x;
if (xx<=0) return;
- wxPen sfp3(*color[0], 4, wxSOLID);
- wxPen sfp2(*color[0], 5, wxSOLID);
- wxPen sfp1(*color[0], 1, wxSOLID);
+ //wxPen sfp3(*color[0], 4, wxSOLID);
+ //wxPen sfp2(*color[0], 5, wxSOLID);
+ //wxPen sfp1(*color[0], 1, wxSOLID);
- wxBrush brush(*color[0],wxFDIAGONAL_HATCH);
- gc.SetBrush(brush);
+ //wxBrush brush(*color[0],wxFDIAGONAL_HATCH);
+ //dc.SetBrush(brush);
+
+ const wxColor & col=*color[0];
for (int n=0;n<data->VC();n++) {
bool done=false;
@@ -1806,7 +2040,7 @@ void gLineOverlayBar::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
}
if (x2>=start_px+width+1) x2=start_px+width+1;
double w1=x2-x1;
- dc.SetPen(sfp1);
+ //dc.SetPen(sfp1);
wxCoord x,y;//,descent,leading;
if (lo_type==LOT_Bar) {
if (rp.m_x==rp.m_y) {
@@ -1815,17 +2049,38 @@ void gLineOverlayBar::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
dc.GetTextExtent(label,&x,&y); //,&descent,&leading);
dc.DrawText(label,x1-(x/2),start_py+20-y);
}
- dc.DrawLine(x1,start_py+25,x1,start_py+height-25);
- dc.SetPen(sfp2);
- dc.DrawLine(x1,start_py+25,x1,start_py+25);
+
+ glColor3f (col.Red(), col.Green(), col.Blue());
+ glLineWidth (0.25);
+ glBegin(GL_LINES);
+ glVertex2f(x1,start_py+25);
+ glVertex2f(x1,start_py+height-25);
+ glEnd();
+ //dc.DrawLine(x1,start_py+25,x1,start_py+height-25);
+
+ glColor3f (col.Red(), col.Green(), col.Blue());
+ glLineWidth (4);
+ glBegin(GL_LINES);
+ glVertex2f(x1,start_py+27);
+ glVertex2f(x1,start_py+23);
+ glEnd();
+
+ //dc.DrawLine(x1,start_py+25,x1,start_py+25);
} else {
// if ((x1>w.GetLeftMargin()) && (x1<w.GetLeftMargin()+w.Width()))
- gc.SetPen(sfp1);
- gc.DrawRectangle(x1,start_py,w1,height);
+
+ //dc.SetPen(sfp1);
+ RoundedRectangle(x1,start_py,w1,height,2,col);
}
} else if (lo_type==LOT_Dot) {
- dc.SetPen(sfp3);
- dc.DrawLine(x1,start_py+(height/2)-10,x1,start_py+(height/2)-10);
+ glColor3f (col.Red(), col.Green(), col.Blue());
+ glLineWidth (4);
+ glBegin(GL_LINES);
+ glVertex2f(x1,start_py+(height/2)-10);
+ glVertex2f(x1,start_py+(height/2)-14);
+ glEnd();
+ //dc.SetPen(sfp3);
+ //dc.DrawLine(x1,start_py+(height/2)-10,x1,start_py+(height/2)-10);
}
@@ -1848,7 +2103,7 @@ gFlagsLine::gFlagsLine(gPointData *d,const wxColor * col,wxString _label,int _li
gFlagsLine::~gFlagsLine()
{
}
-void gFlagsLine::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
+void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
if (!data) return;
@@ -1868,13 +2123,14 @@ void gFlagsLine::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
- static wxColor col1=wxColor(0xff,0xf0,0xd0,0x7f);
- static wxColor col2=wxColor(0xe0,0xff,0xd0,0x7f);
- static wxBrush linebr1(col1, wxSOLID);
- static wxBrush linebr2(col2, wxSOLID);
+ static wxColor col1=wxColor(0xff,0xf0,0xd0,0xff);
+ static wxColor col2=wxColor(0xe0,0xff,0xd0,0xff);
+ //static wxBrush linebr1(col1, wxSOLID);
+ //static wxBrush linebr2(col2, wxSOLID);
+
+ //wxPen sfp1(*color[0], 1, wxSOLID);
+ //wxBrush brush(*color[0],wxSOLID); //FDIAGONAL_HATCH);
- wxPen sfp1(*color[0], 1, wxSOLID);
- wxBrush brush(*color[0],wxSOLID); //FDIAGONAL_HATCH);
dc.SetFont(*smallfont);
dc.SetTextForeground(*wxBLACK);
@@ -1892,13 +2148,12 @@ void gFlagsLine::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
} //else ceil(line_h);
- dc.SetPen(*wxBLACK);
+ //dc.SetPen(*wxBLACK);
+ wxColor *barcol=&col2;
if (line_num & 1) {
- dc.SetBrush(linebr1);
- } else {
- dc.SetBrush(linebr2);
+ barcol=&col1;
}
- dc.DrawRectangle(start_px,line_top,width+1,line_h+1);
+ RoundedRectangle(start_px,line_top,width+1,line_h+1,3,*barcol);
wxCoord x,y; //,descent,leading;
dc.GetTextExtent(label,&x,&y);//,&leading,&descent);
dc.DrawText(label,start_px-x-6,line_top+(line_h/2)-(y/2));
@@ -1908,8 +2163,13 @@ void gFlagsLine::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
dc.DrawRotatedText(w.Title(), start_px-8-lw - y, start_py+((height + x)>>1), 90);
} */
int x1,x2;
- dc.SetBrush(brush);
- dc.SetPen(sfp1);
+ //dc.SetBrush(brush);
+ //dc.SetPen(sfp1);
+
+ const wxColor & col=*color[0];
+ glColor3f (col.Red(), col.Green(), col.Blue());
+ glLineWidth (1);
+
for (int n=0;n<data->VC();n++) {
bool done=false;
@@ -1937,13 +2197,17 @@ void gFlagsLine::Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w)
double w1=x2-x1;
if (rp.m_x==rp.m_y) {
- dc.DrawLine(x1,line_top+4,x1,line_top+line_h-3);
+ glBegin(GL_LINES);
+ glVertex2f(x1,line_top+4);
+ glVertex2f(x1,line_top+line_h-3);
+ glEnd();
+ //dc.DrawLine(x1,line_top+4,x1,line_top+line_h-3);
//dc.SetPen(sfp2);
//dc.DrawLine(x1,w.GetTopMargin()+25,x1,w.GetTopMargin()+25);
} else {
// if ((x1>w.GetLeftMargin()) && (x1<w.GetLeftMargin()+w.Width()))
//gc.SetPen(sfp1);
- dc.DrawRectangle(x1,line_top+4,w1,line_h-6);
+ RoundedRectangle(x1,line_top+4,w1,line_h-6,0,*color[0]);
}
diff --git a/src/graphs/graph.h b/src/graphs/graph.h
index aa03dc78..d354bba4 100644
--- a/src/graphs/graph.h
+++ b/src/graphs/graph.h
@@ -8,6 +8,7 @@ License: LGPL
#define GRAPH_H
#include <wx/dcgraph.h>
+#include <wx/glcanvas.h>
#include <sleeplib/machine.h>
#include <list>
@@ -119,10 +120,10 @@ public:
-class gGraphWindow:public wxWindow // rename to gGraphWindow
+class gGraphWindow:public wxGLCanvas //Window // rename to gGraphWindow
{
public:
- gGraphWindow() {};
+ gGraphWindow();
gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & title=wxT("Graph"),const wxPoint &pos = wxDefaultPosition,const wxSize &size = wxDefaultSize,long flags = 0);
wxBitmap * RenderBitmap(int width,int height);
@@ -141,19 +142,24 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
int GetScrX(void) const { return m_scrX; };
int GetScrY(void) const { return m_scrY; };
- void SetMargins(int top, int right, int bottom, int left);
- const wxString & Title(void ) { return m_title; };
- int GetTopMargin(void) const { return m_marginTop; };
- int GetBottomMargin(void) const { return m_marginBottom; };
- int GetLeftMargin(void) const { return m_marginLeft; };
- int GetRightMargin(void) const { return m_marginRight; };
- void SetTopMargin(int i) { m_marginTop=i; };
- void SetBottomMargin(int i) { m_marginBottom=i; };
- void SetLeftMargin(int i) { m_marginLeft=i; };
- void SetRightMargin(int i) { m_marginRight=i; };
+ // For mouse to screen use only.. work in OpenGL points where possible
- inline int Width() { return m_scrX-m_marginLeft-m_marginRight; };
- inline int Height() { return m_scrY-m_marginTop-m_marginBottom; };
+ const wxString & Title(void ) { return m_title; };
+
+ void SetMargins(float top, float right, float bottom, float left); // OpenGL width of each corners margin
+
+ float GetTopMargin(void) const { return m_marginTop; };
+ float GetBottomMargin(void) const { return m_marginBottom; };
+ float GetLeftMargin(void) const { return m_marginLeft; };
+ float GetRightMargin(void) const { return m_marginRight; };
+
+ void SetTopMargin(float i) { m_marginTop=i; };
+ void SetBottomMargin(float i) { m_marginBottom=i; };
+ void SetLeftMargin(float i) { m_marginLeft=i; };
+ void SetRightMargin(float i) { m_marginRight=i; };
+
+ inline float Width() { return m_scrX-m_marginLeft-m_marginRight; }; // Width of OpenGL main drawing area
+ inline int Height() { return m_scrY-m_marginTop-m_marginBottom; }; // Height of ""...
void LinkZoom(gGraphWindow *g) { link_zoom.push_back(g); }; // Linking graphs changes zoom behaviour..
void LinkMove(gGraphWindow *g) { link_move.push_back(g); }; // Linking graphs changes zoom behaviour..
@@ -176,18 +182,19 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
virtual void ResetXBounds();
virtual void SetXBounds(double minx, double maxx);
virtual void ZoomX(double mult,int origin_px);
+
virtual void ZoomXPixels(int x1, int x2); // Zoom between two selected points on screen
virtual void ZoomXPixels(int x1,int x2,double &rx1,double &rx2);
virtual void MoveX(int i); // Move x bounds by i Pixels
virtual void MoveX(int i,double &min, double & max);
- inline int x2p(double x) {
+ inline float x2p(double x) {
double xx=max_x-min_x;
- double w=(Width()/xx)*(x-min_x);
+ double w=((Width()/xx)*(x-min_x));
return w+GetLeftMargin();
};
- inline double p2x(int px) {
+ inline double p2x(float px) {
double xx=max_x-min_x;
double wx=px-GetLeftMargin();
double ww=wx/Width();
@@ -198,7 +205,7 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
double h=(Height()/yy)*(y-min_y);
return h+GetTopMargin();
};
- inline double p2y(int py) {
+ inline double p2y(float py) {
double yy=max_y-min_y;
double hy=py-GetTopMargin();
double hh=hy/Height();
@@ -217,6 +224,9 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
void SetBlockZoom(bool b) { m_block_zoom=b; };
void SetBlockMove(bool b) { m_block_move=b; };
+ wxGLContext *gl_context;
+
+
protected:
list<gGraphWindow *>link_zoom;
list<gGraphWindow *>link_move;
@@ -234,7 +244,7 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
int m_scrY; //!< Current view's Y dimension
wxPoint m_mouseLClick,m_mouseRClick,m_mouseRClick_start;
- int m_marginTop, m_marginRight, m_marginBottom, m_marginLeft;
+ float m_marginTop, m_marginRight, m_marginBottom, m_marginLeft;
wxRect m_mouseRBrect,m_mouseRBlast;
bool m_mouseLDown,m_mouseRDown,m_datarefresh;
@@ -254,8 +264,9 @@ class gLayer
gLayer(gPointData *g=NULL,wxString title=wxT(""));
virtual ~gLayer();
//virtual void Update() { data=gd; };
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
vector<const wxColor *> color;
+
virtual void SetData(gPointData * gd) { data=gd; };
virtual gPointData * GetData() { return data; };
@@ -285,7 +296,7 @@ class gLayer
virtual void SetMinY(double v) { if (data) data->SetMinY(v); };
virtual void SetMaxY(double v) { if (data) data->SetMaxY(v); };
- virtual inline int x2p(gGraphWindow & g,double x) {
+ /*virtual inline int x2p(gGraphWindow & g,double x) {
double xx=data->MaxX()-data->MinX();
double w=(g.Width()/xx)*(x-data->MinX());
return w+g.GetLeftMargin();
@@ -306,7 +317,7 @@ class gLayer
double hy=py-g.GetTopMargin();
double hh=hy/g.Height();
return data->MinY()+(yy*hh);
- };
+ }; */
void NotifyGraphWindow(gGraphWindow *g) { m_graph.push_back(g); };
void SetVisible(bool v) { m_visible=v; };
bool IsVisible() { return m_visible; };
@@ -324,7 +335,7 @@ class gGraphTitle:public gLayer
public:
gGraphTitle(const wxString & _title,wxOrientation o=wxVERTICAL,const wxFont * font=wxNORMAL_FONT,const wxColor * color=wxBLACK);
virtual ~gGraphTitle();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
wxOrientation Orientation() { return m_orientation; };
static const int Margin=20;
@@ -342,7 +353,7 @@ class gCandleStick:public gLayer
gCandleStick(gPointData *d=NULL,wxOrientation o=wxHORIZONTAL);
virtual ~gCandleStick();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
void AddName(wxString name) { m_names.push_back(name); };
protected:
@@ -356,7 +367,7 @@ class gXAxis:public gLayer
public:
gXAxis(const wxColor * col=wxBLACK);
virtual ~gXAxis();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
static const int Margin=40; // How much room does this take up. (Bottom margin)
protected:
// virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
@@ -366,7 +377,7 @@ class gYAxis:public gLayer
public:
gYAxis(const wxColor * col=wxBLACK);
virtual ~gYAxis();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
void SetShowMinorLines(bool b) { m_show_minor_lines=b; };
void SetShowMajorLines(bool b) { m_show_major_lines=b; };
bool ShowMinorLines() { return m_show_minor_lines; };
@@ -383,7 +394,7 @@ class gFooBar:public gLayer
public:
gFooBar(const wxColor * color1=wxGREEN,const wxColor * color2=wxDARK_GREY);
virtual ~gFooBar();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
static const int Margin=15;
protected:
};
@@ -395,7 +406,7 @@ class gLineChart:public gLayer
gLineChart(gPointData *d=NULL,const wxColor * col=wxBLACK,int dlsize=4096,bool accelerate=false,bool _hide_axes=false,bool _square_plot=false);
virtual ~gLineChart();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
void SetSquarePlot(bool b) { m_square_plot=b; };
bool GetSquarePlot() { return m_square_plot; };
@@ -422,7 +433,7 @@ class gLineOverlayBar:public gLayer
gLineOverlayBar(gPointData *d=NULL,const wxColor * col=wxBLACK,wxString _label=wxT(""),LO_Type _lot=LOT_Bar);
virtual ~gLineOverlayBar();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
protected:
wxString label;
@@ -435,7 +446,7 @@ class gFlagsLine:public gLayer
gFlagsLine(gPointData *d=NULL,const wxColor * col=wxBLACK,wxString _label=wxT(""),int _line_num=0,int _total_lines=0);
virtual ~gFlagsLine();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
protected:
wxString label;
@@ -449,7 +460,7 @@ class gBarChart:public gLayer
gBarChart(gPointData *d=NULL,const wxColor *col=NULL,wxOrientation o=wxHORIZONTAL);
virtual ~gBarChart();
- virtual void Plot(wxDC & dc, wxGraphicsContext & gc, gGraphWindow & w);
+ virtual void Plot(wxDC & dc, gGraphWindow & w);
protected:
wxOrientation m_direction;
diff --git a/src/version.h b/src/version.h
index fd27df44..f9aa2503 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 = 4556;
- static const long REVISION = 8072;
+ static const long BUILD = 4694;
+ static const long REVISION = 8835;
//Miscellaneous Version Types
- static const long BUILDS_COUNT = 3389;
- #define RC_FILEVERSION 0,7,4556,8072
- #define RC_FILEVERSION_STRING "0, 7, 4556, 8072\0"
- static const char FULLVERSION_STRING[] = "0.7.4556.8072";
+ static const long BUILDS_COUNT = 3679;
+ #define RC_FILEVERSION 0,7,4694,8835
+ #define RC_FILEVERSION_STRING "0, 7, 4694, 8835\0"
+ static const char FULLVERSION_STRING[] = "0.7.4694.8835";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;